commit 8f5672ea9d069193e9cebad200767761111fab02
author Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> Thu Feb 15 08:55:49 2018 +0100
committer Joe Hershberger <joe.hershberger@ni.com> Mon Feb 26 15:51:36 2018 -0600
tree 9dd6f49a88691cae2194b9332452c0ec787323a2
parent 1693a577be14a92e61563bad306aa11a359757f5

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>

drivers/net/e1000.c

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 8316854..5cc54ef 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -1181,7 +1181,7 @@
 		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