diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2012-02-07 21:54:53 -0500 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-13 15:28:30 -0500 |
| commit | 520d6f225f83128e9ea083a9a226f807235cc76c (patch) | |
| tree | 750996a7c10d684053d2db23695d926ba202b4c9 /drivers/net/ethernet | |
| parent | 75ce15327030128d713079d1f5e23cbe7af532f6 (diff) | |
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>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/80003es2lan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c index cfb361e5f498..37e78649c710 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) | |||
| 1225 | else | 1225 | else |
| 1226 | reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER; | 1226 | reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER; |
| 1227 | 1227 | ||
| 1228 | ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data); | 1228 | return e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data); |
| 1229 | |||
| 1230 | return 0; | ||
| 1231 | } | 1229 | } |
| 1232 | 1230 | ||
| 1233 | /** | 1231 | /** |