aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/msm/msm_fbdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/msm/msm_fbdev.c')
-rw-r--r--drivers/gpu/drm/msm/msm_fbdev.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index 1f3af13ccede..115b509a4a00 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -241,17 +241,23 @@ struct drm_fb_helper *msm_fbdev_init(struct drm_device *dev)
241 goto fail; 241 goto fail;
242 } 242 }
243 243
244 drm_fb_helper_single_add_all_connectors(helper); 244 ret = drm_fb_helper_single_add_all_connectors(helper);
245 if (ret)
246 goto fini;
245 247
246 /* disable all the possible outputs/crtcs before entering KMS mode */ 248 /* disable all the possible outputs/crtcs before entering KMS mode */
247 drm_helper_disable_unused_functions(dev); 249 drm_helper_disable_unused_functions(dev);
248 250
249 drm_fb_helper_initial_config(helper, 32); 251 ret = drm_fb_helper_initial_config(helper, 32);
252 if (ret)
253 goto fini;
250 254
251 priv->fbdev = helper; 255 priv->fbdev = helper;
252 256
253 return helper; 257 return helper;
254 258
259fini:
260 drm_fb_helper_fini(helper);
255fail: 261fail:
256 kfree(fbdev); 262 kfree(fbdev);
257 return NULL; 263 return NULL;