diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-05-28 23:54:52 -0400 |
| commit | 435462c6e639065460e91903d6bd2af0f5762fde (patch) | |
| tree | bf66ccdd613019035ebab535762366aa1026399b /drivers/pci | |
| parent | d7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff) | |
| parent | b5c42bc8db17db80917f99205a03c51f17354495 (diff) | |
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) | |||
| 557 | } else { | 557 | } else { |
| 558 | error = -ENODEV; | 558 | error = -ENODEV; |
| 559 | /* Fall back to PCI_D0 if native PM is not supported */ | 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 | return error; | 564 | return error; |