---

yaml --- r: 218137 b: refs/heads/master c: 1cdf7fe h: refs/heads/master i: 218135: 869bbf7 v: v3
git-mirror · Oct 2, 2010 · 16d9113 · 16d9113
1 parent 4b6b3bd
commit 16d9113
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae681d969ac0946e09636f2bef7a126d73e1ad6b
+refs/heads/master: 1cdf7fef793c715d8c4998575aba3741fa4a0b01
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3454,7 +3454,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj,
 		if (ret != 0) {
 			drm_gem_object_unreference(target_obj);
 			i915_gem_object_unpin(obj);
-			return -EINVAL;
+			return ret;
 		}
 
 		/* Map the page containing the relocation we're going to