diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-02-27 15:37:37 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-03-05 18:09:39 -0500 |
commit | bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 (patch) | |
tree | 1ee24e8ff4d4d1410db3af01a11193ce7595a980 /drivers/pci/pci.c | |
parent | 64096c17417380d8a472d096645f4cbc9406c987 (diff) |
PCI/PM Runtime: Make runtime PM of PCI devices inactive by default
Make the run-time power management of PCI devices be inactive by
default by calling pm_runtime_forbid() for each PCI device during its
initialization. This setting may be overriden by the user space with
the help of the /sys/devices/.../power/control interface.
That's necessary to avoid breakage on systems where ACPI-based
wake-up is known to fail for some devices.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
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 5b548aee9cbc..6e100ae7f5b5 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1540,8 +1540,10 @@ void pci_pm_init(struct pci_dev *dev) | |||
1540 | int pm; | 1540 | int pm; |
1541 | u16 pmc; | 1541 | u16 pmc; |
1542 | 1542 | ||
1543 | pm_runtime_forbid(&dev->dev); | ||
1543 | device_enable_async_suspend(&dev->dev); | 1544 | device_enable_async_suspend(&dev->dev); |
1544 | dev->wakeup_prepared = false; | 1545 | dev->wakeup_prepared = false; |
1546 | |||
1545 | dev->pm_cap = 0; | 1547 | dev->pm_cap = 0; |
1546 | 1548 | ||
1547 | /* find PCI PM capability in list */ | 1549 | /* find PCI PM capability in list */ |