]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: Fix return value test
authorBenjamin Poirier <bpoirier@suse.com>
Fri, 21 Jul 2017 18:36:25 +0000 (11:36 -0700)
committerJack Vogel <jack.vogel@oracle.com>
Mon, 8 Jan 2018 17:48:17 +0000 (09:48 -0800)
All the helpers return -E1000_ERR_PHY.

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 27069012
(cherry picked from commit d3509f8bc7b0560044c15f0e3ecfde1d9af757a6)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
drivers/net/ethernet/intel/e1000e/netdev.c

index 972332d691b4671d516cc8dddbf54e0299bb5517..39dd1e33a33fa8ccac702f5441dd47dd3cdf5fd2 100644 (file)
@@ -5098,7 +5098,7 @@ static bool e1000e_has_link(struct e1000_adapter *adapter)
                break;
        }
 
-       if ((ret_val == E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
+       if ((ret_val == -E1000_ERR_PHY) && (hw->phy.type == e1000_phy_igp_3) &&
            (er32(CTRL) & E1000_PHY_CTRL_GBE_DISABLE)) {
                /* See e1000_kmrn_lock_loss_workaround_ich8lan() */
                e_info("Gigabit has been disabled, downgrading speed\n");