Merge branch 'pci/huang-d3cold-fixes' into next

* pci/huang-d3cold-fixes:
  PCI/PM: Keep runtime PM enabled for unbound PCI devices
This commit is contained in:
Bjorn Helgaas
2012-12-04 16:13:03 -07:00
2 changed files with 42 additions and 27 deletions

View File

@@ -1910,6 +1910,8 @@ void pci_pm_init(struct pci_dev *dev)
u16 pmc;
pm_runtime_forbid(&dev->dev);
pm_runtime_set_active(&dev->dev);
pm_runtime_enable(&dev->dev);
device_enable_async_suspend(&dev->dev);
dev->wakeup_prepared = false;