From 0876156cec358249d63fa42468b13e87e1d3a276 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 6 Feb 2009 16:55:20 +0000
Subject: [PATCH] --- yaml --- r: 131611 b: refs/heads/master c:
 a198bc80ae59cf7c6da93bc8bd017b2198148ed7 h: refs/heads/master i:   131609:
 0949e54d9c675251a6c0600a8a8650b95f28d82d   131607:
 c8717db055f48deb225cda015ec04bd6f7debb74 v: v3

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

diff --git a/[refs] b/[refs]
index f7d46f6b7d2b..c14cf470b9da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e49c4f4cf786b70bbc369b99e590de4bebac1b3
+refs/heads/master: a198bc80ae59cf7c6da93bc8bd017b2198148ed7
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 818576654092..b79ced8f3c61 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -2480,13 +2480,15 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
 	if (dev_priv->mm.wedged) {
 		DRM_ERROR("Execbuf while wedged\n");
 		mutex_unlock(&dev->struct_mutex);
-		return -EIO;
+		ret = -EIO;
+		goto pre_mutex_err;
 	}
 
 	if (dev_priv->mm.suspended) {
 		DRM_ERROR("Execbuf while VT-switched.\n");
 		mutex_unlock(&dev->struct_mutex);
-		return -EBUSY;
+		ret = -EBUSY;
+		goto pre_mutex_err;
 	}
 
 	/* Look up object handles */