[PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_ring_init()

Christian König christian.koenig at amd.com
Tue Jul 19 12:25:52 UTC 2016


Am 19.07.2016 um 14:15 schrieb Wei Yongjun:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
>
> In case of error, the function debugfs_create_*() returns NULL
> pointer not ERR_PTR() if debugfs is enabled. The IS_ERR() test
> in the return value check should be replaced with NULL test.
> (defined(CONFIG_DEBUG_FS) make sure debugfs is enabled)
>
> Signed-off-by: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
Reviewed-by: Christian König <christian.koenig at amd.com>.

There might be some more cases like this, we have probably copy&pasted 
that code multiple times.

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 3b885e3..9247ae16 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -362,8 +362,8 @@ static int amdgpu_debugfs_ring_init(struct amdgpu_device *adev,
>   	ent = debugfs_create_file(name,
>   				  S_IFREG | S_IRUGO, root,
>   				  ring, &amdgpu_debugfs_ring_fops);
> -	if (IS_ERR(ent))
> -		return PTR_ERR(ent);
> +	if (!ent)
> +		return -ENOMEM;
>   
>   	i_size_write(ent->d_inode, ring->ring_size + 12);
>   	ring->ent = ent;
>
>



More information about the dri-devel mailing list