diff options
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/ich8lan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 0b6095ba3ce9..bcd2bc477af2 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
| @@ -396,7 +396,7 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw) | |||
| 396 | u32 extcnf_ctrl; | 396 | u32 extcnf_ctrl; |
| 397 | u32 timeout = PHY_CFG_TIMEOUT; | 397 | u32 timeout = PHY_CFG_TIMEOUT; |
| 398 | 398 | ||
| 399 | WARN_ON(preempt_count()); | 399 | might_sleep(); |
| 400 | 400 | ||
| 401 | if (!mutex_trylock(&nvm_mutex)) { | 401 | if (!mutex_trylock(&nvm_mutex)) { |
| 402 | WARN(1, KERN_ERR "e1000e mutex contention. Owned by pid %d\n", | 402 | WARN(1, KERN_ERR "e1000e mutex contention. Owned by pid %d\n", |