Merge tag 'drm-intel-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-intel...

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_fbdev.c

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 82993a87654c28ec6be0883698d1a8f67a5abac2..f7e9a4e6959534f867f4b796218e038e7e759760 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -246,7 +246,7 @@ static int intelfb_create(struct drm_fb_helper *helper,
        if (IS_ERR(vaddr)) {
                DRM_ERROR("Failed to remap framebuffer into virtual memory\n");
                ret = PTR_ERR(vaddr);
-               goto out_destroy_fbi;
+               goto out_unpin;
        }
        info->screen_base = vaddr;
        info->screen_size = vma->node.size;
@@ -274,8 +274,6 @@ static int intelfb_create(struct drm_fb_helper *helper,
        vga_switcheroo_client_fb_set(pdev, info);
        return 0;
 
-out_destroy_fbi:
-       drm_fb_helper_release_fbi(helper);
 out_unpin:
        intel_unpin_fb_vma(vma);
 out_unlock:
@@ -534,7 +532,6 @@ static void intel_fbdev_destroy(struct intel_fbdev *ifbdev)
         */
 
        drm_fb_helper_unregister_fbi(&ifbdev->helper);
-       drm_fb_helper_release_fbi(&ifbdev->helper);
 
        drm_fb_helper_fini(&ifbdev->helper);