aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/pci.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 056e8284b5fd..bc4af86da3f9 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1194,8 +1194,15 @@ int pci_power_up(struct pci_dev *dev)
{
bool need_restore = false;
u16 pmcsr;
+ int ret;
- pci_platform_power_transition(dev, PCI_D0);
+ ret = platform_pci_set_power_state(dev, PCI_D0);
+ if (!ret) {
+ pci_update_current_state(dev, PCI_D0);
+ } else if (!dev->pm_cap) { /* Fall back to PCI_D0 */
+ dev->current_state = PCI_D0;
+ return 0;
+ }
if (dev->current_state == PCI_D0)
return 0;