diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tg3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 06bd2f4eee6c..bacbfc582704 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -2237,7 +2237,7 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) | |||
2237 | } | 2237 | } |
2238 | } | 2238 | } |
2239 | } else { | 2239 | } else { |
2240 | do_low_power = false; | 2240 | do_low_power = true; |
2241 | 2241 | ||
2242 | if (tp->link_config.phy_is_low_power == 0) { | 2242 | if (tp->link_config.phy_is_low_power == 0) { |
2243 | tp->link_config.phy_is_low_power = 1; | 2243 | tp->link_config.phy_is_low_power = 1; |
@@ -11544,8 +11544,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) | |||
11544 | if (val & VCPU_CFGSHDW_ASPM_DBNC) | 11544 | if (val & VCPU_CFGSHDW_ASPM_DBNC) |
11545 | tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND; | 11545 | tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND; |
11546 | if ((val & VCPU_CFGSHDW_WOL_ENABLE) && | 11546 | if ((val & VCPU_CFGSHDW_WOL_ENABLE) && |
11547 | (val & VCPU_CFGSHDW_WOL_MAGPKT) && | 11547 | (val & VCPU_CFGSHDW_WOL_MAGPKT)) |
11548 | device_may_wakeup(&tp->pdev->dev)) | ||
11549 | tp->tg3_flags |= TG3_FLAG_WOL_ENABLE; | 11548 | tp->tg3_flags |= TG3_FLAG_WOL_ENABLE; |
11550 | goto done; | 11549 | goto done; |
11551 | } | 11550 | } |