diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-04-16 10:23:51 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-05-04 12:36:17 -0700 |
| commit | 2dd251f0a294300a1cf8f4b63768145fa6153c4d (patch) | |
| tree | 0220bae157fa4e5b70ff8d86cfb92bd7d678c61e /drivers/gpu | |
| parent | 0ee5623f9a6e52df90a78bd21179f8ab370e102e (diff) | |
| download | blackbird-op-linux-2dd251f0a294300a1cf8f4b63768145fa6153c4d.tar.gz blackbird-op-linux-2dd251f0a294300a1cf8f4b63768145fa6153c4d.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e522c702b04e..aab06cfaf70f 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) { |
