PCI PM: Power up devices before restoring their state

[linux-2.6-omap-h63xx.git] / drivers / pci / pci.c

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 17bd9325a245333f4400676ceed18fe58d2f6a34..f0aa3d533839dfa367293506ff6731992659ae57 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1393,12 +1393,11 @@ int pci_restore_standard_config(struct pci_dev *dev)
        pci_power_t prev_state;
        int error;
 
-       pci_restore_state(dev);
        pci_update_current_state(dev, PCI_D0);
 
        prev_state = dev->current_state;
        if (prev_state == PCI_D0)
-               return 0;
+               goto Restore;
 
        error = pci_raw_set_power_state(dev, PCI_D0, false);
        if (error)
@@ -1421,7 +1420,8 @@ int pci_restore_standard_config(struct pci_dev *dev)
 
        dev->current_state = PCI_D0;
 
-       return 0;
+ Restore:
+       return pci_restore_state(dev);
 }
 
 /**