drm/hisilicon/hibmc: Fix wrong pointer passed to PTR_ERR()

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / hisilicon / hibmc / hibmc_drm_fbdev.c

diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
index 9b0696735ba17a72773adf35e33720a9092f0f1e..16fe79053ee1ebf57112e0189d62e0b394a510da 100644 (file)
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
@@ -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;
        }
@@ -135,7 +135,7 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
        info->fbops = &hibmc_drm_fb_ops;
 
        drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0],
-                              hi_fbdev->fb->fb.depth);
+                              hi_fbdev->fb->fb.format->depth);
        drm_fb_helper_fill_var(info, &priv->fbdev->helper, sizes->fb_width,
                               sizes->fb_height);