From 2071d79ae2e914ed2ff4b9758e25581661febc73 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 23 Jun 2010 19:03:01 +0200
Subject: [PATCH] --- yaml --- r: 210183 b: refs/heads/master c:
 c877cdce93a44eea96f6cf7fc04be7d0372db2be h: refs/heads/master i:   210181:
 1571b434647825e19855958ca09fa40cc80eb18f   210179:
 3f385df73c74751b6598471d50a9db2f8d4cacd2   210175:
 1df5364ba0ccc5cbe1f2fdd5be4752fdfa02f834 v: v3

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

diff --git a/[refs] b/[refs]
index 2a5d9bedbcf6..099477967583 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9927a403ca8c97798129953fa9cbb5dc259c7cb9
+refs/heads/master: c877cdce93a44eea96f6cf7fc04be7d0372db2be
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 68526f467c87..748c26340c35 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -3588,6 +3588,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
 		if (ret != 0) {
 			DRM_ERROR("copy %d cliprects failed: %d\n",
 				  args->num_cliprects, ret);
+			ret = -EFAULT;
 			goto pre_mutex_err;
 		}
 	}