aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-11-20 18:27:59 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-21 14:34:25 -0500
commitde39b7523348640f4c0e662e430c67594d858a08 (patch)
tree12256a9145acb20ddfb3cd25c545ee80726669b6 /drivers/net/e1000e
parent53ec5498d107a61b84944351d32324ce52788b74 (diff)
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.c5
-rw-r--r--drivers/net/e1000e/es2lan.c5
-rw-r--r--drivers/net/e1000e/ich8lan.c5
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)
948 948
949 /* Initialize identification LED */ 949 /* Initialize identification LED */
950 ret_val = e1000e_id_led_init(hw); 950 ret_val = e1000e_id_led_init(hw);
951 if (ret_val) { 951 if (ret_val)
952 e_dbg("Error initializing identification LED\n"); 952 e_dbg("Error initializing identification LED\n");
953 return ret_val; 953 /* This is not fatal and we should not stop init due to this */
954 }
955 954
956 /* Disabling VLAN filtering */ 955 /* Disabling VLAN filtering */
957 e_dbg("Initializing the IEEE VLAN\n"); 956 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)
803 803
804 /* Initialize identification LED */ 804 /* Initialize identification LED */
805 ret_val = e1000e_id_led_init(hw); 805 ret_val = e1000e_id_led_init(hw);
806 if (ret_val) { 806 if (ret_val)
807 e_dbg("Error initializing identification LED\n"); 807 e_dbg("Error initializing identification LED\n");
808 return ret_val; 808 /* This is not fatal and we should not stop init due to this */
809 }
810 809
811 /* Disabling VLAN filtering */ 810 /* Disabling VLAN filtering */
812 e_dbg("Initializing the IEEE VLAN\n"); 811 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)
2722 2722
2723 /* Initialize identification LED */ 2723 /* Initialize identification LED */
2724 ret_val = mac->ops.id_led_init(hw); 2724 ret_val = mac->ops.id_led_init(hw);
2725 if (ret_val) { 2725 if (ret_val)
2726 e_dbg("Error initializing identification LED\n"); 2726 e_dbg("Error initializing identification LED\n");
2727 return ret_val; 2727 /* This is not fatal and we should not stop init due to this */
2728 }
2729 2728
2730 /* Setup the receive address. */ 2729 /* Setup the receive address. */
2731 e1000e_init_rx_addrs(hw, mac->rar_entry_count); 2730 e1000e_init_rx_addrs(hw, mac->rar_entry_count);