From 16d911354eb9893dbd838d6c4a5d782e35ba70d0 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 2 Oct 2010 15:12:41 +0100
Subject: [PATCH] --- yaml --- r: 218137 b: refs/heads/master c:
 1cdf7fef793c715d8c4998575aba3741fa4a0b01 h: refs/heads/master i:   218135:
 869bbf79e1abf438b3510050967e4c3a966784fa v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 413730d6ce85..ea503bb6593b 100644
--- 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
index db9d36fb5883..a78c97340605 100644
--- 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