---

yaml --- r: 110143 b: refs/heads/master c: 95b866d h: refs/heads/master i: 110141: 34efe93 110139: e06bdb4 110135: 75f6c75 110127: f50a8d0 110111: c6a9995 110079: 8578b17 v: v3
git-mirror · Oct 3, 2008 · e788915 · e788915
1 parent 84c5667
commit e788915
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: b5ff7df3df9efab511244d5a299fce706c71af48
+refs/heads/master: 95b866d5afcafee00fc9ad70665e48c86d8c4e0f
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
@@ -396,7 +396,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 	u32 extcnf_ctrl;
 	u32 timeout = PHY_CFG_TIMEOUT;
 
-	WARN_ON(preempt_count());
+	might_sleep();
 
 	if (!mutex_trylock(&nvm_mutex)) {
 		WARN(1, KERN_ERR "e1000e mutex contention. Owned by pid %d\n",