1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 46767c53917..12d1e81a8ab 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -18,6 +18,7 @@
 #include <linux/sched.h>
 #include <linux/cpu.h>
 #include <linux/pm_runtime.h>
+#include <linux/suspend.h>
 #include "pci.h"
 
 struct pci_dynid {
@@ -616,6 +617,21 @@ static int pci_pm_prepare(struct device *dev)
         int error = 0;
 
         /*
+         * If a PCI device configured to wake up the system from sleep states
+         * has been suspended at run time and there's a resume request pending
+         * for it, this is equivalent to the device signaling wakeup, so the
+         * system suspend operation should be aborted.
+         */
+        pm_runtime_get_noresume(dev);
+        if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
+                pm_wakeup_event(dev, 0);
+
+        if (pm_wakeup_pending()) {
+                pm_runtime_put_sync(dev);
+                return -EBUSY;
+        }
+
+        /*
          * PCI devices suspended at run time need to be resumed at this
          * point, because in general it is necessary to reconfigure them for
          * system suspend.  Namely, if the device is supposed to wake up the
@@ -624,7 +640,7 @@ static int pci_pm_prepare(struct device *dev)
          * system from the sleep state, we'll have to prevent it from signaling
          * wake-up.
          */
-        pm_runtime_get_sync(dev);
+        pm_runtime_resume(dev);
 
         if (drv && drv->pm && drv->pm->prepare)
                 error = drv->pm->prepare(dev);