diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 888bd9cc2710..c4a23c7ac170 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -5278,7 +5278,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake, | |||
5278 | } | 5278 | } |
5279 | 5279 | ||
5280 | if (adapter->flags & FLAG_IS_ICH) | 5280 | if (adapter->flags & FLAG_IS_ICH) |
5281 | e1000e_disable_gig_wol_ich8lan(&adapter->hw); | 5281 | e1000_suspend_workarounds_ich8lan(&adapter->hw); |
5282 | 5282 | ||
5283 | /* Allow time for pending master requests to run */ | 5283 | /* Allow time for pending master requests to run */ |
5284 | e1000e_disable_pcie_master(&adapter->hw); | 5284 | e1000e_disable_pcie_master(&adapter->hw); |
@@ -5429,6 +5429,9 @@ static int __e1000_resume(struct pci_dev *pdev) | |||
5429 | return err; | 5429 | return err; |
5430 | } | 5430 | } |
5431 | 5431 | ||
5432 | if (hw->mac.type == e1000_pch2lan) | ||
5433 | e1000_resume_workarounds_pchlan(&adapter->hw); | ||
5434 | |||
5432 | e1000e_power_up_phy(adapter); | 5435 | e1000e_power_up_phy(adapter); |
5433 | 5436 | ||
5434 | /* report the system wakeup cause from S3/S4 */ | 5437 | /* report the system wakeup cause from S3/S4 */ |