aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-11-20 23:28:17 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-21 11:34:28 -0800
commit9b724613c91ce60806ffc689f5032ff258644c6c (patch)
treea2e6f4f24eb180b5b0615c2ce0dd9d67446b894a /drivers/net/e1000e
parentde39b7523348640f4c0e662e430c67594d858a08 (diff)
downloadkernel_samsung_smdk4412-9b724613c91ce60806ffc689f5032ff258644c6c.zip
kernel_samsung_smdk4412-9b724613c91ce60806ffc689f5032ff258644c6c.tar.gz
kernel_samsung_smdk4412-9b724613c91ce60806ffc689f5032ff258644c6c.tar.bz2
e1000e: remove redundant might_sleep()
Now that mutex_lock() calls might_sleep() the driver doesn't have to here. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e')
-rw-r--r--drivers/net/e1000e/ich8lan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index fe6dc3d..f991b14 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/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) {