---

yaml --- r: 228779 b: refs/heads/master c: 340479a h: refs/heads/master i: 228777: ae888ea 228775: f4acefe v: v3
git-mirror · Dec 5, 2010 · 176fdc0 · 176fdc0
1 parent b2d01b2
commit 176fdc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4add75c43f39573edc884d46b7c2b7414f01171a
+refs/heads/master: 340479aac697bc73e225c122a9753d4964eeda3f
diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c
@@ -440,7 +440,8 @@ int i915_reset(struct drm_device *dev, u8 flags)
 	bool need_display = true;
 	int ret;
 
-	mutex_lock(&dev->struct_mutex);
+	if (!mutex_trylock(&dev->struct_mutex))
+		return -EBUSY;
 
 	i915_gem_reset(dev);