summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-29 13:54:52 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-05-29 13:54:52 +1000
commit435462c6e639065460e91903d6bd2af0f5762fde (patch)
treebf66ccdd613019035ebab535762366aa1026399b /drivers/pci
parentd7b41b1fdf162d3e26cb73bf2cf14816918e371e (diff)
parentb5c42bc8db17db80917f99205a03c51f17354495 (diff)
Merge branch 'merge' into next
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 34bf0fdf504..1a91bf9687a 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;