diff mbox

[-next] drm/vgem: Fix return value check in vgem_init()

Message ID 20170521011939.8111-1-weiyj.lk@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Yongjun May 21, 2017, 1:19 a.m. UTC
From: Wei Yongjun <weiyongjun1@huawei.com>

In case of error, the function platform_device_register_simple() returns
ERR_PTR() and never returns NULL. The NULL test in the return value
check should be replaced with IS_ERR().

Fixes: 315f0242aa2b ("drm/vgem: Convert to a struct drm_device subclass")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/gpu/drm/vgem/vgem_drv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel Vetter May 22, 2017, 7:48 a.m. UTC | #1
On Sun, May 21, 2017 at 01:09:05PM +0100, Chris Wilson wrote:
> On Sun, May 21, 2017 at 01:19:39AM +0000, Wei Yongjun wrote:
> > From: Wei Yongjun <weiyongjun1@huawei.com>
> > 
> > In case of error, the function platform_device_register_simple() returns
> > ERR_PTR() and never returns NULL. The NULL test in the return value
> > check should be replaced with IS_ERR().
> > 
> > Fixes: 315f0242aa2b ("drm/vgem: Convert to a struct drm_device subclass")
> 
> This is wrong, the bug was introduced in
> af33a9190d02 ("drm/vgem: Enable dmabuf import interfaces")
> not that it matters since it is the same tag.

Fixed.

> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> 
> Checked it is an ERR_PTR return on failure, so
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Applied, thanks for patch&review.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 54ec94c..18f401b 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -438,8 +438,8 @@  static int __init vgem_init(void)
 
 	vgem_device->platform =
 		platform_device_register_simple("vgem", -1, NULL, 0);
-	if (!vgem_device->platform) {
-		ret = -ENODEV;
+	if (IS_ERR(vgem_device->platform)) {
+		ret = PTR_ERR(vgem_device->platform);
 		goto out_fini;
 	}