diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 16:44:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-20 16:44:37 -0700 |
| commit | ecca1c5e3a55d1581be9aa9144642c67de70e33b (patch) | |
| tree | 9ddf9cd7ca85657a834a5819bf9dc6a04bcad21a | |
| parent | 5805977e63a36ad56594a623f3bd2bebcb7db233 (diff) | |
| parent | b3bad72e494fb2ff0c81be4ca2ddb94adf6a47c2 (diff) | |
| download | linux-ecca1c5e3a55d1581be9aa9144642c67de70e33b.tar.gz linux-ecca1c5e3a55d1581be9aa9144642c67de70e33b.tar.bz2 linux-ecca1c5e3a55d1581be9aa9144642c67de70e33b.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: Fix initialization and kexec breakage for some devices
| -rw-r--r-- | drivers/pci/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 34bf0fdf5047..1a91bf9687af 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -557,7 +557,8 @@ static int pci_platform_power_transition(struct pci_dev *dev, pci_power_t state) } else { error = -ENODEV; /* Fall back to PCI_D0 if native PM is not supported */ - pci_update_current_state(dev, PCI_D0); + if (!dev->pm_cap) + dev->current_state = PCI_D0; } return error; |