diff options
| author |   Bruce Allan <bruce.w.allan@intel.com> | 2012-02-08 02:54:58 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-02-13 12:28:37 -0800 |
| commit | 8649f4319656f9fcaa59726799a824254b0a1bce (patch) | |
| tree | fc803dcec06d8c7fd00019360b685495a14f0501 /drivers/net/ethernet/intel | |
| parent | e1000e: potentially incorrect return for e1000_cfg_kmrn_10_100_80003es2lan (diff) | |
| download | linux-dev-8649f4319656f9fcaa59726799a824254b0a1bce.tar.xz linux-dev-8649f4319656f9fcaa59726799a824254b0a1bce.zip | |
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().
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/intel')
| -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 37e78649c710..99eb09007e73 100644 --- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c +++ b/drivers/net/ethernet/intel/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); } /** |