---

yaml --- r: 171796 b: refs/heads/master c: 9b72461 h: refs/heads/master v: v3
git-mirror · Nov 21, 2009 · 7df0f6e · 7df0f6e
1 parent 199455b
commit 7df0f6e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de39b7523348640f4c0e662e430c67594d858a08
+refs/heads/master: 9b724613c91ce60806ffc689f5032ff258644c6c
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
@@ -630,8 +630,6 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 	u32 extcnf_ctrl, timeout = PHY_CFG_TIMEOUT;
 	s32 ret_val = 0;
 
-	might_sleep();
-
 	mutex_lock(&swflag_mutex);
 
 	while (timeout) {