Commit 520d6f22 authored Feb 08, 2012 by Bruce Allan Committed by Jeff Kirsher Feb 13, 2012

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 <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 75ce1532

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**