aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-02-08 02:55:51 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-13 13:28:31 -0800
commit2a31b37a8956154df099400ba93cd6898a629c6d (patch)
tree4c8cc81ebf4749a1e531a8cb09847ac9739df2d3 /drivers/net/ethernet/intel
parente1000e: potentially incorrect return for e1000_init_hw_ich8lan (diff)
downloadlinux-dev-2a31b37a8956154df099400ba93cd6898a629c6d.tar.xz
linux-dev-2a31b37a8956154df099400ba93cd6898a629c6d.zip
e1000e: potentially incorrect return for e1000e_setup_fiber_serdes_link
In the unlikely event that e1000_poll_fiber_serdes_link_generic() is called and it returns an error, the returned error code value is not propagated to the caller of e1000e_setup_fiber_serdes_link(). 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/mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index b3b2f9e567ff..943b9090fda0 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -922,7 +922,7 @@ s32 e1000e_setup_fiber_serdes_link(struct e1000_hw *hw)
e_dbg("No signal detected\n");
}
- return 0;
+ return ret_val;
}
/**