summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBernhard Messerklinger <bernhard.messerklinger@br-automation.com>2018-02-15 10:55:49 +0300
committerJoe Hershberger <joe.hershberger@ni.com>2018-02-27 00:51:36 +0300
commit8f5672ea9d069193e9cebad200767761111fab02 (patch)
tree9dd6f49a88691cae2194b9332452c0ec787323a2 /drivers/net
parent1693a577be14a92e61563bad306aa11a359757f5 (diff)
downloadu-boot-8f5672ea9d069193e9cebad200767761111fab02.tar.xz
net: e1000: Fix e1000_igb semaphore handling
Fix commit f1bcad22dd19 ("net: e1000: add support for writing to EEPROM"). Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 8316854bc1..5cc54efe48 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -1181,7 +1181,7 @@ e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
return;
swsm = E1000_READ_REG(hw, SWSM);
- if (hw->mac_type == e1000_80003es2lan) {
+ if (hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_igb) {
/* Release both semaphores. */
swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
} else