| Date | Fri, 22 Oct 2010 11:51:22 -0700 | From | Greg KH <> | Subject | [048/103] drivers/gpu/drm/i915/i915_gem.c: Add missing error handling code |
| |
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Julia Lawall <julia@diku.dk>
commit 929f49bf225b1b6cd04d0a7b9c0f7377d9131220 upstream.
Extend the error handling code with operations found in other nearby error handling code
A simplified version of the sematic match that finds this problem is as follows: (http://coccinelle.lip6.fr/)
// <smpl> @r exists@ @r@ statement S1,S2,S3; constant C1,C2,C3; @@
*if (...) {... S1 return -C1;} ... *if (...) {... when != S1 return -C2;} ... *if (...) {... S1 return -C3;} // </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3367,6 +3367,8 @@ i915_gem_object_pin_and_relocate(struct (int) reloc->offset, reloc->read_domains, reloc->write_domain); + drm_gem_object_unreference(target_obj); + i915_gem_object_unpin(obj); return -EINVAL; } if (reloc->write_domain & I915_GEM_DOMAIN_CPU ||
|