---

yaml --- r: 211229 b: refs/heads/master c: 929f49b h: refs/heads/master i: 211227: 26788a9 v: v3
git-mirror · Oct 2, 2010 · ea26a20 · ea26a20
1 parent 54e4cab
commit ea26a20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e39a01501b228e1be2037d5bddccae2a820af902
+refs/heads/master: 929f49bf225b1b6cd04d0a7b9c0f7377d9131220
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3258,6 +3258,8 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
 				  (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 ||