Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de39b752 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller
Browse files

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: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53ec5498

drivers/net/e1000e/82571.c

+2 −3
Original line number Diff line number Diff line
@@ -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");

drivers/net/e1000e/es2lan.c

+2 −3
Original line number Diff line number Diff line
@@ -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");

drivers/net/e1000e/ich8lan.c

+2 −3
Original line number Diff line number Diff line
@@ -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);