summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorGreg Edwards <gedwards@ddn.com>2017-07-20 10:15:14 -0600
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2017-08-08 18:08:00 -0700
commitd466124860cf96a6d4db5af5b3500f53f0d1bc7a (patch)
treeb2e8b1dd7208243115be57717ca696e9175b0e19 /drivers/net/ethernet/intel
parent0d3ee0d9251ceb2c937e7c0c1adb366fdb0812c8 (diff)
downloadlinux-d466124860cf96a6d4db5af5b3500f53f0d1bc7a.tar.gz
linux-d466124860cf96a6d4db5af5b3500f53f0d1bc7a.tar.bz2
linux-d466124860cf96a6d4db5af5b3500f53f0d1bc7a.zip
igbvf: convert msleep to mdelay in atomic context
This fixes a "scheduling while atomic" splat seen with CONFIG_DEBUG_ATOMIC_SLEEP enabled. Signed-off-by: Greg Edwards <gedwards@ddn.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/igbvf/vf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c
index 1d3aa9adcaa8..9577ccf4b26a 100644
--- a/drivers/net/ethernet/intel/igbvf/vf.c
+++ b/drivers/net/ethernet/intel/igbvf/vf.c
@@ -149,7 +149,7 @@ static s32 e1000_reset_hw_vf(struct e1000_hw *hw)
msgbuf[0] = E1000_VF_RESET;
mbx->ops.write_posted(hw, msgbuf, 1);
- msleep(10);
+ mdelay(10);
/* set our "perm_addr" based on info provided by PF */
ret_val = mbx->ops.read_posted(hw, msgbuf, 3);