projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e2873d4
)
ixgbe: Use udelay to avoid sleeping while atomic
author
Mark Rustad
<
[email protected]
>
Fri, 29 Jan 2016 22:44:29 +0000
(14:44 -0800)
committer
Jeff Kirsher
<
[email protected]
>
Wed, 30 Mar 2016 05:37:17 +0000
(22:37 -0700)
Use udelay instead of usleep_range because this can be called while
a lock is held.
Signed-off-by: Mark Rustad <
[email protected]
>
Tested-by: Andrew Bowers <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
index 87aca3f7c3dec65125fa757d4dfbedd5ca5a3748..68a9c646498e17aa3bc3a0e5494604f4a5e22067 100644
(file)
--- 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)
command = IXGBE_READ_REG(hw, IXGBE_SB_IOSF_INDIRECT_CTRL);
if (!(command & IXGBE_SB_IOSF_CTRL_BUSY))
break;
- u
sleep_range(10, 2
0);
+ u
delay(1
0);
}
if (ctrl)
*ctrl = command;