forked from luck/tmp_suning_uos_patched
e1000e: do not error out on identification LED init failure
A failure to initialize the identification LED is not a fatal condition and should allow the init path to continue. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
53ec5498d1
commit
de39b75233
|
@ -948,10 +948,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
|
|||
|
||||
/* Initialize identification LED */
|
||||
ret_val = e1000e_id_led_init(hw);
|
||||
if (ret_val) {
|
||||
if (ret_val)
|
||||
e_dbg("Error initializing identification LED\n");
|
||||
return ret_val;
|
||||
}
|
||||
/* This is not fatal and we should not stop init due to this */
|
||||
|
||||
/* Disabling VLAN filtering */
|
||||
e_dbg("Initializing the IEEE VLAN\n");
|
||||
|
|
|
@ -803,10 +803,9 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
|
|||
|
||||
/* Initialize identification LED */
|
||||
ret_val = e1000e_id_led_init(hw);
|
||||
if (ret_val) {
|
||||
if (ret_val)
|
||||
e_dbg("Error initializing identification LED\n");
|
||||
return ret_val;
|
||||
}
|
||||
/* This is not fatal and we should not stop init due to this */
|
||||
|
||||
/* Disabling VLAN filtering */
|
||||
e_dbg("Initializing the IEEE VLAN\n");
|
||||
|
|
|
@ -2722,10 +2722,9 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
|
|||
|
||||
/* Initialize identification LED */
|
||||
ret_val = mac->ops.id_led_init(hw);
|
||||
if (ret_val) {
|
||||
if (ret_val)
|
||||
e_dbg("Error initializing identification LED\n");
|
||||
return ret_val;
|
||||
}
|
||||
/* This is not fatal and we should not stop init due to this */
|
||||
|
||||
/* Setup the receive address. */
|
||||
e1000e_init_rx_addrs(hw, mac->rar_entry_count);
|
||||
|
|
Loading…
Reference in New Issue
Block a user