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:
commit
522dba7134
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue