From 00ed1a64e4a489c6a1dd1d5b5c5693b966e4cb43 Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Sat, 18 Apr 2009 10:43:32 +0800
Subject: [PATCH] --- yaml --- r: 144309 b: refs/heads/master c:
 d816f6ac4f9877509baa3610be0d25b7afc29c00 h: refs/heads/master i:   144307:
 3974adb7e265203d6d4cd65460cad09cf67d4db9 v: v3

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

diff --git a/[refs] b/[refs]
index a9ecf31f2836..2975c0a5ad1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72021788678523047161e97b3dfed695e802a5fd
+refs/heads/master: d816f6ac4f9877509baa3610be0d25b7afc29c00
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index 4642115902d6..ee896d91c5bc 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -4087,8 +4087,10 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
 	dev_priv->mm.suspended = 0;
 
 	ret = i915_gem_init_ringbuffer(dev);
-	if (ret != 0)
+	if (ret != 0) {
+		mutex_unlock(&dev->struct_mutex);
 		return ret;
+	}
 
 	spin_lock(&dev_priv->mm.active_list_lock);
 	BUG_ON(!list_empty(&dev_priv->mm.active_list));