diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 10:13:00 +0200 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-19 10:14:50 +0200 |
commit | fb9a90f7c674f3ddef6baf55cb1612dadd8ea752 (patch) | |
tree | f25cf2ce17449ba34cdfdfb948134eb3464e400e /drivers/gpu/drm/i915/intel_fb.c | |
parent | drm/i915: Update hotplug interrupts register definitions for Sandybridge (diff) | |
parent | drm, kdb, kms: Change mode_set_base_atomic() enter argument to be an enum (diff) | |
download | linux-fb9a90f7c674f3ddef6baf55cb1612dadd8ea752.tar.xz linux-fb9a90f7c674f3ddef6baf55cb1612dadd8ea752.zip |
Merge remote branch 'airlied/drm-core-next' into tmp
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fb.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index b937ccfa7bec..af2a1dddc28e 100644 --- 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; } } |