]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/hisilicon/hibmc: Fix wrong pointer passed to PTR_ERR()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 12 Jan 2017 15:19:21 +0000 (15:19 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 14 May 2017 12:08:30 +0000 (14:08 +0200)
commit bdf6f135973acb409b3ec5a6214fb597670a0bc0 upstream.

PTR_ERR should access the value just tested by IS_ERR, otherwise
the wrong error code will be returned.

Fixes: d1667b86795a ("drm/hisilicon/hibmc: Add support for frame buffer")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170112151921.16538-1-weiyj.lk@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c

index 9b0696735ba17a72773adf35e33720a9092f0f1e..d8659eba73d491538c23f602f6fddffbdc7b483f 100644 (file)
@@ -121,7 +121,7 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
 
        hi_fbdev->fb = hibmc_framebuffer_init(priv->dev, &mode_cmd, gobj);
        if (IS_ERR(hi_fbdev->fb)) {
-               ret = PTR_ERR(info);
+               ret = PTR_ERR(hi_fbdev->fb);
                DRM_ERROR("failed to initialize framebuffer: %d\n", ret);
                goto out_release_fbi;
        }