]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm/i915: Release object along create user fb error path
authorChris Wilson <chris@chris-wilson.co.uk>
Sat, 16 Apr 2011 09:23:51 +0000 (10:23 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 21 May 2011 22:13:09 +0000 (15:13 -0700)
commit 2dd251f0a294300a1cf8f4b63768145fa6153c4d upstream.

Reported-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/i915/intel_display.c

index ecf8f947b4b79f8073b37236fedcea6c4c6ffd81..841558bc91cc2d7903c034446149541381319ee6 100644 (file)
@@ -6005,8 +6005,10 @@ intel_user_framebuffer_create(struct drm_device *dev,
                return ERR_PTR(-ENOENT);
 
        intel_fb = kzalloc(sizeof(*intel_fb), GFP_KERNEL);
-       if (!intel_fb)
+       if (!intel_fb) {
+               drm_gem_object_unreference_unlocked(&obj->base);
                return ERR_PTR(-ENOMEM);
+       }
 
        ret = intel_framebuffer_init(dev, intel_fb, mode_cmd, obj);
        if (ret) {