aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Rustad <mark.d.rustad@intel.com>2016-01-29 17:44:29 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-03-30 01:37:17 -0400
commitd90b5b0ec1c7a3099dee9c18071a5b714eb3de52 (patch)
treedbec3d53734137d0333d581a0ab67061d18c9b91
parente2873d43f9c607e9d855b8ae120d5990ba1722df (diff)
ixgbe: Use udelay to avoid sleeping while atomic
Use udelay instead of usleep_range because this can be called while a lock is held. Signed-off-by: Mark Rustad <mark.d.rustad@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 87aca3f7c3de..68a9c646498e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
@@ -355,7 +355,7 @@ static s32 ixgbe_iosf_wait(struct ixgbe_hw *hw, u32 *ctrl)
355 command = IXGBE_READ_REG(hw, IXGBE_SB_IOSF_INDIRECT_CTRL); 355 command = IXGBE_READ_REG(hw, IXGBE_SB_IOSF_INDIRECT_CTRL);
356 if (!(command & IXGBE_SB_IOSF_CTRL_BUSY)) 356 if (!(command & IXGBE_SB_IOSF_CTRL_BUSY))
357 break; 357 break;
358 usleep_range(10, 20); 358 udelay(10);
359 } 359 }
360 if (ctrl) 360 if (ctrl)
361 *ctrl = command; 361 *ctrl = command;