projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
intel
/
e1000e
/
nvm.c
diff --git
a/drivers/net/ethernet/intel/e1000e/nvm.c
b/drivers/net/ethernet/intel/e1000e/nvm.c
index 84fecc268162417b676f65066abc2fb2e4bd20bf..44ddc0a0ee0e4287ee17b6a389904aaedb9b226a 100644
(file)
--- a/
drivers/net/ethernet/intel/e1000e/nvm.c
+++ b/
drivers/net/ethernet/intel/e1000e/nvm.c
@@
-630,7
+630,7
@@
void e1000e_reload_nvm_generic(struct e1000_hw *hw)
{
u32 ctrl_ext;
- u
delay(1
0);
+ u
sleep_range(10, 2
0);
ctrl_ext = er32(CTRL_EXT);
ctrl_ext |= E1000_CTRL_EXT_EE_RST;
ew32(CTRL_EXT, ctrl_ext);