From 40fa7c5d9748265467aedc5e0b7593d6e43a1fea Mon Sep 17 00:00:00 2001
From: Daniel J Blueman <daniel.blueman@gmail.com>
Date: Mon, 17 May 2010 14:23:52 +0100
Subject: [PATCH] --- yaml --- r: 199585 b: refs/heads/master c:
 f953c9353f5fe6e98fa7f32f51060a74d845b5f8 h: refs/heads/master i:   199583:
 7a6c98ef28e3dd7a1dbe19e4b92a5f816a8bc89b v: v3

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

diff --git a/[refs] b/[refs]
index a8e86bf9fcb8..55e4b1eb7e4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f41275e893191eeb7a88e431d594e167adbd5234
+refs/heads/master: f953c9353f5fe6e98fa7f32f51060a74d845b5f8
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
index d40f62d36453..c072b212979c 100644
--- a/trunk/drivers/gpu/drm/i915/i915_drv.c
+++ b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -370,6 +370,7 @@ int i965_reset(struct drm_device *dev, u8 flags)
 		}
 	} else {
 		DRM_ERROR("Error occurred. Don't know how to reset this chip.\n");
+		mutex_unlock(&dev->struct_mutex);
 		return -ENODEV;
 	}