diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-26 13:00:57 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-26 13:00:57 -0700 |
| commit | d3fe3988fb24e5ed13b2243b789a652882d3b26c (patch) | |
| tree | 1257424a712583bf474cb0831621a47e73dfc3de /drivers/pci/pci-driver.c | |
| parent | 7db78a9c864d1baf916d849febef31e274cfcb1f (diff) | |
| parent | ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc (diff) | |
| download | linux-stable-d3fe3988fb24e5ed13b2243b789a652882d3b26c.tar.gz linux-stable-d3fe3988fb24e5ed13b2243b789a652882d3b26c.tar.bz2 linux-stable-d3fe3988fb24e5ed13b2243b789a652882d3b26c.zip | |
Merge branch 'for-linus' into next
* for-linus:
PCI/portdrv: Don't create hotplug slots unless port supports hotplug
PCI/PM: Fix proc config reg access for D3cold and bridge suspending
PCI/PM: Resume device before shutdown
PCI/PM: Fix deadlock when unbinding device if parent in D3cold
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 11d9c8a9d0d0..24aa44c6ed02 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -398,6 +398,8 @@ static void pci_device_shutdown(struct device *dev) struct pci_dev *pci_dev = to_pci_dev(dev); struct pci_driver *drv = pci_dev->driver; + pm_runtime_resume(dev); + if (drv && drv->shutdown) drv->shutdown(pci_dev); pci_msi_shutdown(pci_dev); @@ -408,16 +410,6 @@ static void pci_device_shutdown(struct device *dev) * continue to do DMA */ pci_disable_device(pci_dev); - - /* - * Devices may be enabled to wake up by runtime PM, but they need not - * be supposed to wake up the system from its "power off" state (e.g. - * ACPI S5). Therefore disable wakeup for all devices that aren't - * supposed to wake up the system at this point. The state argument - * will be ignored by pci_enable_wake(). - */ - if (!device_may_wakeup(dev)) - pci_enable_wake(pci_dev, PCI_UNKNOWN, false); } #ifdef CONFIG_PM |