---

yaml --- r: 318658 b: refs/heads/master c: d54a02c h: refs/heads/master v: v3
git-mirror · Jul 5, 2012 · 9fb2ba6 · 9fb2ba6
1 parent 338f196
commit 9fb2ba6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c3c115a1eaea5c699caa49e824df6e5b48396a4
+refs/heads/master: d54a02c041ccfdcfe3efcd1e5b90c6e8d5e7a8d9
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -730,8 +730,7 @@ int i915_reset(struct drm_device *dev)
 	if (!i915_try_reset)
 		return 0;
 
-	if (!mutex_trylock(&dev->struct_mutex))
-		return -EBUSY;
+	mutex_lock(&dev->struct_mutex);
 
 	i915_gem_reset(dev);