[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1468930520-10348-1-git-send-email-weiyj_lk@163.com>
Date: Tue, 19 Jul 2016 12:15:20 +0000
From: Wei Yongjun <weiyj_lk@....com>
To: alexander.deucher@....com, christian.koenig@....com,
airlied@...ux.ie, tom.stdenis@....com, Jammy.Zhou@....com,
David1.Zhou@....com, Monk.Liu@....com, Jerry.Zhang@....com
Cc: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>,
dri-devel@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: [PATCH -next] drm/amdgpu: fix return value check in amdgpu_debugfs_ring_init()
From: Wei Yongjun <yongjun_wei@...ndmicro.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@...ndmicro.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;
Powered by blists - more mailing lists