e1000e: potential incorrect return for e1000_setup_copper_link_80003es2lan

In the unlikely event that e1000e_setup_copper_link() returns an error,
the returned error code value is not propogated to the caller of
e1000_setup_copper_link_80003es2lan().

(cherry picked from commit 8649f4319656f9fcaa59726799a824254b0a1bce)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/e1000e/80003es2lan.c b/drivers/net/e1000e/80003es2lan.c
index 9ef0941758015ad6c2b65e9837fb5af0a83e3b41..f13ce84af4105847a3919b46e7cd63281e279635 100644 (file)
--- a/drivers/net/e1000e/80003es2lan.c
+++ b/drivers/net/e1000e/80003es2lan.c
@@ -1147,9 +1147,7 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
        if (ret_val)
                return ret_val;
 
-       ret_val = e1000e_setup_copper_link(hw);
-
-       return 0;
+       return e1000e_setup_copper_link(hw);
 }
 
 /**