1 files changed, 15 insertions, 6 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 29b9220ec399..3000bc4c136b 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -390,18 +390,27 @@ int radeon_fbdev_init(struct radeon_device *rdev)
         ret = drm_fb_helper_init(rdev->ddev, &rfbdev->helper,
                                  rdev->num_crtc,
                                  RADEONFB_CONN_LIMIT);
-        if (ret) {
-                kfree(rfbdev);
-                return ret;
-        }
+        if (ret)
+                goto free;
 
-        drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
+        ret = drm_fb_helper_single_add_all_connectors(&rfbdev->helper);
+        if (ret)
+                goto fini;
 
         /* disable all the possible outputs/crtcs before entering KMS mode */
         drm_helper_disable_unused_functions(rdev->ddev);
 
-        drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+        ret = drm_fb_helper_initial_config(&rfbdev->helper, bpp_sel);
+        if (ret)
+                goto fini;
+
         return 0;
+
+fini:
+        drm_fb_helper_fini(&rfbdev->helper);
+free:
+        kfree(rfbdev);
+        return ret;
 }
 
 void radeon_fbdev_fini(struct radeon_device *rdev)