---

yaml --- r: 199585 b: refs/heads/master c: f953c93 h: refs/heads/master i: 199583: 7a6c98e v: v3
git-mirror · May 26, 2010 · 40fa7c5 · 40fa7c5
1 parent 07f78c6
commit 40fa7c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 	}