summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-12-13 15:23:32 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 15:08:30 +0300
commit2f6aeeae43bbb603a47013923402150493e3ac2f (patch)
tree8ab780afb024594a9dcd8a426e1073ca88edc1af
parent9302f2b14af11af0054029ba0455f6d9c03d044a (diff)
downloadlinux-2f6aeeae43bbb603a47013923402150493e3ac2f.tar.xz
drm: mxsfb: drm_dev_alloc() returns error pointers
commit e89e50ac35d9126907a436dabe70f9a8311b9981 upstream. We should be checking for IS_ERR() instead of NULL because drm_dev_alloc() returns error pointers. Fixes: 45d59d704080 ("drm: Add new driver for MXSFB controller") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20161213122332.GA7519@elgon.mountain Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/mxsfb/mxsfb_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
index 79a18bf48b54..955441f71500 100644
--- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
+++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
@@ -395,8 +395,8 @@ static int mxsfb_probe(struct platform_device *pdev)
pdev->id_entry = of_id->data;
drm = drm_dev_alloc(&mxsfb_driver, &pdev->dev);
- if (!drm)
- return -ENOMEM;
+ if (IS_ERR(drm))
+ return PTR_ERR(drm);
ret = mxsfb_load(drm, 0);
if (ret)