aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci-driver.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 9e1d2959e226..94c6e2aa03d6 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -607,21 +607,6 @@ static int pci_pm_prepare(struct device *dev)
607 int error = 0; 607 int error = 0;
608 608
609 /* 609 /*
610 * If a PCI device configured to wake up the system from sleep states
611 * has been suspended at run time and there's a resume request pending
612 * for it, this is equivalent to the device signaling wakeup, so the
613 * system suspend operation should be aborted.
614 */
615 pm_runtime_get_noresume(dev);
616 if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
617 pm_wakeup_event(dev, 0);
618
619 if (pm_wakeup_pending()) {
620 pm_runtime_put_sync(dev);
621 return -EBUSY;
622 }
623
624 /*
625 * PCI devices suspended at run time need to be resumed at this 610 * PCI devices suspended at run time need to be resumed at this
626 * point, because in general it is necessary to reconfigure them for 611 * point, because in general it is necessary to reconfigure them for
627 * system suspend. Namely, if the device is supposed to wake up the 612 * system suspend. Namely, if the device is supposed to wake up the
@@ -644,8 +629,6 @@ static void pci_pm_complete(struct device *dev)
644 629
645 if (drv && drv->pm && drv->pm->complete) 630 if (drv && drv->pm && drv->pm->complete)
646 drv->pm->complete(dev); 631 drv->pm->complete(dev);
647
648 pm_runtime_put_sync(dev);
649} 632}
650 633
651#else /* !CONFIG_PM_SLEEP */ 634#else /* !CONFIG_PM_SLEEP */