e1000e: potentially incorrect return for e1000_init_hw_ich8lan
authorBruce Allan <bruce.w.allan@intel.com>
Wed, 8 Feb 2012 02:55:46 +0000 (02:55 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Mon, 13 Feb 2012 21:28:23 +0000 (13:28 -0800)
In the unlikely event that e1000_setup_link_ich8lan() returns an error,
the returned error code value is not propagated to the caller of
e1000_init_hw_ich8lan().

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/ich8lan.c

index e2c546d..c4d65b8 100644 (file)
@@ -3276,7 +3276,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
         */
        e1000_clear_hw_cntrs_ich8lan(hw);
 
-       return 0;
+       return ret_val;
 }
 /**
  *  e1000_initialize_hw_bits_ich8lan - Initialize required hardware bits