e1000e: potentially incorrect return for e1000_cfg_kmrn_10_100_80003es2lan

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

(cherry picked from commit 520d6f225f83128e9ea083a9a226f807235cc76c)
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 460256988338322012fe5e953cf838505f50dcfa..9ef0941758015ad6c2b65e9837fb5af0a83e3b41 100644 (file)
--- a/drivers/net/e1000e/80003es2lan.c
+++ b/drivers/net/e1000e/80003es2lan.c
@@ -1225,9 +1225,7 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
        else
                reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
 
-       ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
-
-       return 0;
+       return e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
 }
 
 /**