diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-12-18 23:14:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-18 23:14:59 -0500 |
commit | db94ce90d3d571c11637a912cc39cfb80df3879c (patch) | |
tree | 516e25fcaf084ace70c3c36cd1e978dd27aba6a4 | |
parent | afdafff130142ef4d6478dcff6d9e879394fd348 (diff) |
e1000e: LED settings in EEPROM ignored on 82571 and 82572
Do not override the customizable LED configuration set in the EEPROM.
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>
-rw-r--r-- | drivers/net/e1000e/82571.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index c1a42cfc80ba..b979464091bb 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c | |||
@@ -1290,7 +1290,6 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw) | |||
1290 | static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw) | 1290 | static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw) |
1291 | { | 1291 | { |
1292 | u32 ctrl; | 1292 | u32 ctrl; |
1293 | u32 led_ctrl; | ||
1294 | s32 ret_val; | 1293 | s32 ret_val; |
1295 | 1294 | ||
1296 | ctrl = er32(CTRL); | 1295 | ctrl = er32(CTRL); |
@@ -1305,11 +1304,6 @@ static s32 e1000_setup_copper_link_82571(struct e1000_hw *hw) | |||
1305 | break; | 1304 | break; |
1306 | case e1000_phy_igp_2: | 1305 | case e1000_phy_igp_2: |
1307 | ret_val = e1000e_copper_link_setup_igp(hw); | 1306 | ret_val = e1000e_copper_link_setup_igp(hw); |
1308 | /* Setup activity LED */ | ||
1309 | led_ctrl = er32(LEDCTL); | ||
1310 | led_ctrl &= IGP_ACTIVITY_LED_MASK; | ||
1311 | led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE); | ||
1312 | ew32(LEDCTL, led_ctrl); | ||
1313 | break; | 1307 | break; |
1314 | default: | 1308 | default: |
1315 | return -E1000_ERR_PHY; | 1309 | return -E1000_ERR_PHY; |