Merge remote branch 'airlied/drm-core-next' into tmp

[net-next-2.6.git] / drivers / gpu / drm / i915 / intel_fb.c

diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index b937ccfa7bec9a037ae7b6fddf6d635552a4aba1..af2a1dddc28e2e908529db44a24cea44ff10d387 100644 (file)
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -225,8 +225,8 @@ static void intel_fbdev_destroy(struct drm_device *dev,
 
        drm_framebuffer_cleanup(&ifb->base);
        if (ifb->obj) {
-               drm_gem_object_handle_unreference_unlocked(ifb->obj);
                drm_gem_object_unreference_unlocked(ifb->obj);
+               ifb->obj = NULL;
        }
 }