diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-05 03:35:00 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-05 03:35:00 -0700 |
| commit | c70a3a9203ba327b86a4ce895c04e6d4ef18ee57 (patch) | |
| tree | 46a209a5fe13259be57d07cbfaee3f88103874f2 /drivers/net/e1000e/lib.c | |
| parent | c71d8ebe7a4496fb7231151cb70a6baa0cb56f9a (diff) | |
| parent | b57e35bd0e545181c94405ce35b89000aed56cc5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net
Diffstat (limited to 'drivers/net/e1000e/lib.c')
| -rw-r--r-- | drivers/net/e1000e/lib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/lib.c b/drivers/net/e1000e/lib.c index 65580b40594..7898a67d650 100644 --- a/drivers/net/e1000e/lib.c +++ b/drivers/net/e1000e/lib.c @@ -1986,6 +1986,7 @@ static s32 e1000_ready_nvm_eeprom(struct e1000_hw *hw) /* Clear SK and CS */ eecd &= ~(E1000_EECD_CS | E1000_EECD_SK); ew32(EECD, eecd); + e1e_flush(); udelay(1); /* |