---

yaml --- r: 243677 b: refs/heads/master c: 9f01b25 h: refs/heads/master i: 243675: f14de2e v: v3
git-mirror · Mar 31, 2011 · eb9fc67 · eb9fc67
1 parent 3aaeaea
commit eb9fc67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ee3b5a12740eddc5a76e130b6cc7cc64468d1f7
+refs/heads/master: 9f01b25048ad12b5d71f4f7d3b62ef737639a08d
diff --git a/trunk/drivers/gpu/drm/i915/intel_drv.h b/trunk/drivers/gpu/drm/i915/intel_drv.h
@@ -39,7 +39,7 @@
 			ret__ = -ETIMEDOUT;				\
 			break;						\
 		}							\
-		if (W && !in_dbg_master()) msleep(W);			\
+		if (W && !(in_atomic() || in_dbg_master())) msleep(W);	\
 	}								\
 	ret__;								\
 })