From: Bruce Allan Date: Wed, 8 Feb 2012 02:54:53 +0000 (+0000) Subject: e1000e: potentially incorrect return for e1000_cfg_kmrn_10_100_80003es2lan X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=520d6f225f83128e9ea083a9a226f807235cc76c;p=~shefty%2Frdma-dev.git 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(). Signed-off-by: Bruce Allan Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher --- diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index cfb361e5f49..37e78649c71 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/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); } /**