2021-05-24 13:26:21

by Wei Yongjun

Subject: [PATCH -next] drm/amdgpu: fix error return code in amdgpu_acpi_init()

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 77bf762f8b30 ("drm/amdgpu/acpi: unify ATCS handling (v3)")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index 49563ff87f1a..9564690b21b4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@ -895,12 +895,15 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
atcs:
/* Probe for ATCS, and initialize it if found */
atcs_handle = amdgpu_atcs_probe_handle(handle);
- if (!atcs_handle)
+ if (!atcs_handle) {
+ ret = -ENODEV;
goto out;
+ }

atcs = kzalloc(sizeof(*atcs), GFP_KERNEL);
if (!atcs) {
DRM_WARN("Not enough memory to initialize ATCS\n");
+ ret = -ENOMEM;
goto out;
}
atcs->handle = atcs_handle;

2021-05-24 18:13:41

by Alex Deucher

Subject: Re: [PATCH -next] drm/amdgpu: fix error return code in amdgpu_acpi_init()

On Mon, May 24, 2021 at 9:25 AM Wei Yongjun <[email protected]> wrote:
>
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.

I don't see any other cases in this function where we return an error.
It could arguably be made a void. All of these APCI methods are
optional.

Alex

>
> Fixes: 77bf762f8b30 ("drm/amdgpu/acpi: unify ATCS handling (v3)")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> index 49563ff87f1a..9564690b21b4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
> @@ -895,12 +895,15 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)
> atcs:
> /* Probe for ATCS, and initialize it if found */
> atcs_handle = amdgpu_atcs_probe_handle(handle);
> - if (!atcs_handle)
> + if (!atcs_handle) {
> + ret = -ENODEV;
> goto out;
> + }
>
> atcs = kzalloc(sizeof(*atcs), GFP_KERNEL);
> if (!atcs) {
> DRM_WARN("Not enough memory to initialize ATCS\n");
> + ret = -ENOMEM;
> goto out;
> }
> atcs->handle = atcs_handle;
>