diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-04 18:13:03 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-04 18:13:03 -0500 |
| commit | edb1daab8e91338b7e2a6c41faec695891ccda35 (patch) | |
| tree | 2f5ce32e53fee349e7f0ffb384a5d952a0a94f2f /drivers/pci/pci.c | |
| parent | be5cd530bd23ef3e00dcb4998e151de9fdd1a104 (diff) | |
| parent | 967577b062417b4e4b8e27b711220f4124f5153a (diff) | |
Merge branch 'pci/huang-d3cold-fixes' into next
* pci/huang-d3cold-fixes:
PCI/PM: Keep runtime PM enabled for unbound PCI devices
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index adffc6f621e5..5b862b1c93c6 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1910,6 +1910,8 @@ void pci_pm_init(struct pci_dev *dev) | |||
| 1910 | u16 pmc; | 1910 | u16 pmc; |
| 1911 | 1911 | ||
| 1912 | pm_runtime_forbid(&dev->dev); | 1912 | pm_runtime_forbid(&dev->dev); |
| 1913 | pm_runtime_set_active(&dev->dev); | ||
| 1914 | pm_runtime_enable(&dev->dev); | ||
| 1913 | device_enable_async_suspend(&dev->dev); | 1915 | device_enable_async_suspend(&dev->dev); |
| 1914 | dev->wakeup_prepared = false; | 1916 | dev->wakeup_prepared = false; |
| 1915 | 1917 | ||