1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 98772d37b09f..cdbef32897f0 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -529,8 +529,10 @@ static void intel_fbdev_destroy(struct drm_device *dev,
 
         drm_fb_helper_fini(&ifbdev->helper);
 
-        drm_framebuffer_unregister_private(&ifbdev->fb->base);
-        drm_framebuffer_remove(&ifbdev->fb->base);
+        if (ifbdev->fb) {
+                drm_framebuffer_unregister_private(&ifbdev->fb->base);
+                drm_framebuffer_remove(&ifbdev->fb->base);
+        }
 }
 
 /*