e1000e: potentially incorrect return for e1000e_setup_fiber_serdes_link
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 8 Feb 2012 02:55:51 +0000 (02:55 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 13 Feb 2012 21:28:31 +0000 (13:28 -0800)
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>
drivers/net/ethernet/intel/e1000e/mac.c

index b3b2f9e567ffc9b4dc75b075011771144e471b6f..943b9090fda088df92718de723fbd8044b180637 100644 (file)
@@ -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;
 }
 
 /**