lkml.org 
[lkml]   [2016]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH -next] drm/amdgpu: fix return value check in amdgpu_ttm_debugfs_init()
From
Date
Am 19.07.2016 um 14:15 schrieb Wei Yongjun:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function debugfs_create_file() 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@trendmicro.com.cn>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index b7742e6..8c569ea 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1345,16 +1345,16 @@ static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev)
>
> ent = debugfs_create_file("amdgpu_vram", S_IFREG | S_IRUGO, root,
> adev, &amdgpu_ttm_vram_fops);
> - if (IS_ERR(ent))
> - return PTR_ERR(ent);
> + if (!ent)
> + return -ENOMEM;
> i_size_write(ent->d_inode, adev->mc.mc_vram_size);
> adev->mman.vram = ent;
>
> #ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS
> ent = debugfs_create_file("amdgpu_gtt", S_IFREG | S_IRUGO, root,
> adev, &amdgpu_ttm_gtt_fops);
> - if (IS_ERR(ent))
> - return PTR_ERR(ent);
> + if (!ent)
> + return -ENOMEM;
> i_size_write(ent->d_inode, adev->mc.gtt_size);
> adev->mman.gtt = ent;
>
>

\
 
 \ /
  Last update: 2016-07-19 15:21    [W:0.061 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site