diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2009-11-21 02:27:59 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-21 22:34:25 +0300 |
| commit | de39b7523348640f4c0e662e430c67594d858a08 (patch) | |
| tree | 12256a9145acb20ddfb3cd25c545ee80726669b6 /drivers/net/e1000e | |
| parent | 53ec5498d107a61b84944351d32324ce52788b74 (diff) | |
| download | linux-de39b7523348640f4c0e662e430c67594d858a08.tar.xz | |
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>
Diffstat (limited to 'drivers/net/e1000e')
| -rw-r--r-- | drivers/net/e1000e/82571.c | 5 | ||||
| -rw-r--r-- | drivers/net/e1000e/es2lan.c | 5 | ||||
| -rw-r--r-- | drivers/net/e1000e/ich8lan.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index c5dc1b3be230..474f4e419d20 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c @@ -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"); diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c index 8a089569c6e1..6ba1228836e7 100644 --- a/drivers/net/e1000e/es2lan.c +++ b/drivers/net/e1000e/es2lan.c @@ -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"); diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 2c1d08e04436..fe6dc3de9ac7 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -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); |