diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 19:10:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 19:10:29 -0500 |
| commit | 522dba7134d6b2e5821d3457f7941ec34f668e6d (patch) | |
| tree | e2ad937216c513a545abbe4ccff0c57519b9c080 | |
| parent | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 (diff) | |
| parent | bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 (diff) | |
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 897fa5ccdb78..fdcf01af6762 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -1583,8 +1583,10 @@ void pci_pm_init(struct pci_dev *dev) | |||
| 1583 | int pm; | 1583 | int pm; |
| 1584 | u16 pmc; | 1584 | u16 pmc; |
| 1585 | 1585 | ||
| 1586 | pm_runtime_forbid(&dev->dev); | ||
| 1586 | device_enable_async_suspend(&dev->dev); | 1587 | device_enable_async_suspend(&dev->dev); |
| 1587 | dev->wakeup_prepared = false; | 1588 | dev->wakeup_prepared = false; |
| 1589 | |||
| 1588 | dev->pm_cap = 0; | 1590 | dev->pm_cap = 0; |
| 1589 | 1591 | ||
| 1590 | /* find PCI PM capability in list */ | 1592 | /* find PCI PM capability in list */ |