Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1446376
| Path | csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Wei Yongjun <weiyj_lk@163.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH -next] drm/amdgpu: fix return value check in amdgpu_ttm_debugfs_init() |
| Date | Tue, 19 Jul 2016 14:20:01 +0200 |
| Message-ID | <rWCad-3Tc-1@gated-at.bofh.it> (permalink) |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=Nho+D 1Fd4RogNcG39Et64ffws2BDPCatna7PzkvaZ9E=; b=e3qeRp3xXoO5i2QWfaiaf +5vOEJZesxIEgHKrV4+MmW3cl87b7hw74ddUpQfvtmnBN8JcT70PjxfFwTpX3+Sd 5WRR4kEho4T+DjK9KxRBV0n4wcbD+u+fjHcijOOX75FStwKoJfHfZl2BhoxmrR2l /qiC0CSieuDSNvvXNpyU4k= |
| X-Mailer | git-send-email 2.7.4 |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=ISO-8859-1 |
| Content-Transfer-Encoding | 7bit |
| X-Cm-Transid | EMCowABXZ5fmGY5Xe36AAQ--.37612S2 |
| X-Coremail-Antispam | 1Uf129KBjvJXoWxJF17Jr43ZrW3GF4DtF1UWrg_yoW8GF1kpa nYvFyqqry8Zw17t348AF48Xr9Yv3Z2qFyxGrWUuwnY934rJr4rtw43JrW5Xr97urZ7urWS qFZ0g3yUX3ZFvF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jLjjDUUUUU= |
| X-Originating-IP | [180.110.255.208] |
| X-Cm-Senderinfo | pzhl5yxbonqiywtou0bp/1tbivwer1lWBTBMiDgAAsi |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 36 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Wei Yongjun <yongjun_wei@trendmicro.com.cn>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org |
| X-Original-Date | Tue, 19 Jul 2016 12:15:34 +0000 |
| X-Original-Message-ID | <1468930534-10432-1-git-send-email-weiyj_lk@163.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1446376 |
Show key headers only | View raw
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>
---
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;
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH -next] drm/amdgpu: fix return value check in amdgpu_ttm_debugfs_init() Wei Yongjun <weiyj_lk@163.com> - 2016-07-19 14:20 +0200
csiph-web