Merge tag 'drm-for-v4.12' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / gpu / drm / udl / udl_fb.c

diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index b1f0d523dff91557cd94137c226c6def48ac3255..4a650036256444ed84d1d2ef4e349236d5eb5f26 100644 (file)
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -381,7 +381,7 @@ static int udlfb_create(struct drm_fb_helper *helper,
 
        ret = udl_framebuffer_init(dev, &ufbdev->ufb, &mode_cmd, obj);
        if (ret)
-               goto out_destroy_fbi;
+               goto out_gfree;
 
        fb = &ufbdev->ufb.base;
 
@@ -403,8 +403,6 @@ static int udlfb_create(struct drm_fb_helper *helper,
                      ufbdev->ufb.obj->vmapping);
 
        return ret;
-out_destroy_fbi:
-       drm_fb_helper_release_fbi(helper);
 out_gfree:
        drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base);
 out:
@@ -419,7 +417,6 @@ static void udl_fbdev_destroy(struct drm_device *dev,
                              struct udl_fbdev *ufbdev)
 {
        drm_fb_helper_unregister_fbi(&ufbdev->helper);
-       drm_fb_helper_release_fbi(&ufbdev->helper);
        drm_fb_helper_fini(&ufbdev->helper);
        drm_framebuffer_unregister_private(&ufbdev->ufb.base);
        drm_framebuffer_cleanup(&ufbdev->ufb.base);