* [PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_ring_init()
@ 2016-07-19 12:15 Wei Yongjun
2016-07-19 12:25 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2016-07-19 12:15 UTC (permalink / raw)
To: alexander.deucher, christian.koenig, airlied, tom.stdenis,
Jammy.Zhou, David1.Zhou, Monk.Liu, Jerry.Zhang
Cc: Wei Yongjun, dri-devel, linux-kernel
From: Wei Yongjun <yongjun_wei@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@trendmicro.com.cn>
---
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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_ring_init()
2016-07-19 12:15 [PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_ring_init() Wei Yongjun
@ 2016-07-19 12:25 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2016-07-19 12:25 UTC (permalink / raw)
To: Wei Yongjun, alexander.deucher, airlied, tom.stdenis, Jammy.Zhou,
David1.Zhou, Monk.Liu, Jerry.Zhang
Cc: Wei Yongjun, dri-devel, linux-kernel
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_*() 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>.
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;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-19 12:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-19 12:15 [PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_ring_init() Wei Yongjun
2016-07-19 12:25 ` Christian König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).