diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:15:49 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:15:49 +0200 |
| commit | ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6 (patch) | |
| tree | 673b095f144484f42e94c8d89860acb7f5e5aab5 /drivers/pci/pci-driver.c | |
| parent | Merge tag 'pm-extra-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | PCI / PM: Fix native PME handling during system suspend/resume (diff) | |
| download | linux-dev-ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6.tar.xz linux-dev-ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6.zip | |
Merge branch 'pm-pci'
* pm-pci:
PCI / PM: Fix native PME handling during system suspend/resume
PCI / PM: Restore PME Enable after config space restoration
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 607f677f48d2..d51e8738f9c2 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -511,6 +511,7 @@ static int pci_restore_standard_config(struct pci_dev *pci_dev) } pci_restore_state(pci_dev); + pci_pme_restore(pci_dev); return 0; } @@ -522,6 +523,7 @@ static void pci_pm_default_resume_early(struct pci_dev *pci_dev) { pci_power_up(pci_dev); pci_restore_state(pci_dev); + pci_pme_restore(pci_dev); pci_fixup_device(pci_fixup_resume_early, pci_dev); } |