diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 16:10:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 16:10:29 -0800 |
| commit | 522dba7134d6b2e5821d3457f7941ec34f668e6d (patch) | |
| tree | e2ad937216c513a545abbe4ccff0c57519b9c080 | |
| parent | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 (diff) | |
| parent | bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 (diff) | |
| download | linux-3.10-522dba7134d6b2e5821d3457f7941ec34f668e6d.tar.gz linux-3.10-522dba7134d6b2e5821d3457f7941ec34f668e6d.tar.bz2 linux-3.10-522dba7134d6b2e5821d3457f7941ec34f668e6d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI/PM Runtime: Make runtime PM of PCI devices inactive by default
| -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 897fa5ccdb7..fdcf01af676 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1583,8 +1583,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 */ |