From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 16 Apr 2011 09:23:51 +0000 (+0100)
Subject: drm/i915: Release object along create user fb error path
X-Git-Tag: v2.6.39-rc7~2^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dd251f0a294300a1cf8f4b63768145fa6153c4d;p=platform%2Fkernel%2Flinux-3.10.git

drm/i915: Release object along create user fb error path

Reported-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e522c70..aab06cf 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6579,8 +6579,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) {