Skip to content

Commit

Permalink
e1000e: do not error out on identification LED init failure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bruce Allan authored and David S. Miller committed Nov 21, 2009
1 parent 53ec549 commit de39b75
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
5 changes: 2 additions & 3 deletions drivers/net/e1000e/82571.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/e1000e/es2lan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/e1000e/ich8lan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit de39b75

Please sign in to comment.