[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1468930488-10230-1-git-send-email-weiyj_lk@163.com>
Date: Tue, 19 Jul 2016 12:14:48 +0000
From: Wei Yongjun <weiyj_lk@....com>
To: alexander.deucher@....com, christian.koenig@....com,
airlied@...ux.ie, Flora.Cui@....com, David1.Zhou@....com,
tom.stdenis@....com, Jammy.Zhou@....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_regs_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_device.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 614fb02..0c992d3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2530,12 +2530,12 @@ static int amdgpu_debugfs_regs_init(struct amdgpu_device *adev)
ent = debugfs_create_file(debugfs_regs_names[i],
S_IFREG | S_IRUGO, root,
adev, debugfs_regs[i]);
- if (IS_ERR(ent)) {
+ if (!ent) {
for (j = 0; j < i; j++) {
debugfs_remove(adev->debugfs_regs[i]);
adev->debugfs_regs[i] = NULL;
}
- return PTR_ERR(ent);
+ return -ENOMEM;
}
if (!i)
Powered by blists - more mailing lists