e1000e: Fix check_for_link return value with autoneg off

[pandora-kernel.git] / drivers / net / ethernet / intel / e1000e / lib.c

diff --git a/drivers/net/ethernet/intel/e1000e/lib.c b/drivers/net/ethernet/intel/e1000e/lib.c
index 8224a12..bfc80c3 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/lib.c
+++ b/drivers/net/ethernet/intel/e1000e/lib.c
@@ -478,10 +478,8 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw)
         * If we are forcing speed/duplex, then we simply return since
         * we have already determined whether we have link or not.
         */
-       if (!mac->autoneg) {
-               ret_val = -E1000_ERR_CONFIG;
-               return ret_val;
-       }
+       if (!mac->autoneg)
+               return 1;
 
        /*
         * Auto-Neg is enabled.  Auto Speed Detection takes care