diff options
| author | Benjamin Herrenschmidt | 2009-05-29 05:54:52 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2009-05-29 05:54:52 +0200 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /drivers/pci | |
| parent | powerpc/pci: clean up direct access to sysdata by iseries platform (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap... (diff) | |
| download | kernel-qcow2-linux-435462c6e639065460e91903d6bd2af0f5762fde.tar.gz kernel-qcow2-linux-435462c6e639065460e91903d6bd2af0f5762fde.tar.xz kernel-qcow2-linux-435462c6e639065460e91903d6bd2af0f5762fde.zip | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/pci')
| -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; |