diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-02-27 21:37:37 +0100 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-03-06 00:09:39 +0100 |
commit | bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 (patch) | |
tree | 1ee24e8ff4d4d1410db3af01a11193ce7595a980 /drivers/pci | |
parent | Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-bb910a7040e90a0ca3d3e8245d6d5c128a5d1287.tar.xz linux-bb910a7040e90a0ca3d3e8245d6d5c128a5d1287.zip |
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')
-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) int pm; u16 pmc; + pm_runtime_forbid(&dev->dev); device_enable_async_suspend(&dev->dev); dev->wakeup_prepared = false; + dev->pm_cap = 0; /* find PCI PM capability in list */ |