tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Fix initialization and kexec breakage for some devices

Linus Torvalds ecca1c5e 5805977e

+2 -1
+2 -1
drivers/pci/pci.c
··· 557 557 } else { 558 558 error = -ENODEV; 559 559 /* Fall back to PCI_D0 if native PM is not supported */ 560 - pci_update_current_state(dev, PCI_D0); 560 + if (!dev->pm_cap) 561 + dev->current_state = PCI_D0; 561 562 } 562 563 563 564 return error;