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

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

e1000e: LED settings in EEPROM ignored on 82571 and 82572 



Do not override the customizable LED configuration set in the EEPROM.

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 afdafff1

drivers/net/e1000e/82571.c

+0 −6
Original line number Diff line number Diff line
@@ -1290,7 +1290,6 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw) 
static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw)

{

	u32 ctrl;

	u32 led_ctrl;

	s32 ret_val;



	ctrl = er32(CTRL);
@@ -1305,11 +1304,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw) 
		break;

	case e1000_phy_igp_2:

		ret_val = e1000e_copper_link_setup_igp(hw);

		/* Setup activity LED */

		led_ctrl = er32(LEDCTL);

		led_ctrl &= IGP_ACTIVITY_LED_MASK;

		led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);

		ew32(LEDCTL, led_ctrl);

		break;

	default:

		return -E1000_ERR_PHY;