net: e1000: Fix e1000_igb semaphore handling
authorBernhard Messerklinger <bernhard.messerklinger@br-automation.com>
Thu, 15 Feb 2018 07:55:49 +0000 (08:55 +0100)
committerJoe Hershberger <joe.hershberger@ni.com>
Mon, 26 Feb 2018 21:51:36 +0000 (15:51 -0600)
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

index 8316854bc17792ea59ebef738303afa0fe4b2721..5cc54efe483ad6bad71434fe42f60201cf1437ca 100644 (file)
@@ -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