Merge branch 'pm-core'

[uclinux-h8/linux.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index d19bd54..07b8a9b 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -680,13 +680,6 @@ static int pci_pm_prepare(struct device *dev)
 {
        struct device_driver *drv = dev->driver;
 
-       /*
-        * Devices having power.ignore_children set may still be necessary for
-        * suspending their children in the next phase of device suspend.
-        */
-       if (dev->power.ignore_children)
-               pm_runtime_resume(dev);
-
        if (drv && drv->pm && drv->pm->prepare) {
                int error = drv->pm->prepare(dev);
                if (error < 0)
@@ -825,6 +818,9 @@ static int pci_pm_suspend_noirq(struct device *dev)
                        pci_prepare_to_sleep(pci_dev);
        }
 
+       dev_dbg(dev, "PCI PM: Suspend power state: %s\n",
+               pci_power_name(pci_dev->current_state));
+
        pci_pm_set_unknown_state(pci_dev);
 
        /*