dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Linus Torvalds 2010-03-08 16:10:29 -08:00
parent 51d0f6d1f5 bb910a7040
commit 522dba7134
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/pci.c
View File

@ -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 */