diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2009-12-18 20:14:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-18 20:14:59 -0800 |
| commit | db94ce90d3d571c11637a912cc39cfb80df3879c (patch) | |
| tree | 516e25fcaf084ace70c3c36cd1e978dd27aba6a4 /drivers | |
| parent | afdafff130142ef4d6478dcff6d9e879394fd348 (diff) | |
| download | linux-stable-db94ce90d3d571c11637a912cc39cfb80df3879c.tar.gz linux-stable-db94ce90d3d571c11637a912cc39cfb80df3879c.tar.bz2 linux-stable-db94ce90d3d571c11637a912cc39cfb80df3879c.zip | |
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>
Diffstat (limited to 'drivers')
| -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) 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; |