2018-12-04 06:32:17

by Wei Yongjun

Subject: [PATCH -next] drm/amdgpu: Fix return value check in amdgpu_allocate_static_csa()

Fix the return value check which testing the wrong variable
in amdgpu_allocate_static_csa().

Fixes: 7946340fa389 ("drm/amdgpu: Move csa related code to separate file")
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
index 0c590dd..a5fbc6f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
@@ -43,7 +43,7 @@ int amdgpu_allocate_static_csa(struct amdgpu_device *adev, struct amdgpu_bo **bo
r = amdgpu_bo_create_kernel(adev, size, PAGE_SIZE,
domain, bo,
NULL, &ptr);
- if (!bo)
+ if (!r)
return -ENOMEM;

memset(ptr, 0, size);

2018-12-04 06:41:36

by Chunming Zhou

Subject: Re: [PATCH -next] drm/amdgpu: Fix return value check in amdgpu_allocate_static_csa()

On 2018年12月04日 14:39, Wei Yongjun wrote:
> Fix the return value check which testing the wrong variable
> in amdgpu_allocate_static_csa().
>
> Fixes: 7946340fa389 ("drm/amdgpu: Move csa related code to separate file")
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> index 0c590dd..a5fbc6f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
> @@ -43,7 +43,7 @@ int amdgpu_allocate_static_csa(struct amdgpu_device *adev, struct amdgpu_bo **bo
> r = amdgpu_bo_create_kernel(adev, size, PAGE_SIZE,
> domain, bo,
> NULL, &ptr);
> - if (!bo)
> + if (!r)
> return -ENOMEM;
I guess original is correct as well, if you want to change it, you can
make like below, not your 'if (!r)':
                if (r)
                        return r;

-David
>
> memset(ptr, 0, size);
>
>
>