Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3f68e2919dc5..a690fd400260 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1713,8 +1713,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
 
         dpm_wait_for_subordinate(dev, async);
 
-        if (async_error)
+        if (async_error) {
+                dev->power.direct_complete = false;
                 goto Complete;
+        }
 
         /*
          * If a device configured to wake up the system from sleep states
@@ -1726,6 +1728,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
                 pm_wakeup_event(dev, 0);
 
         if (pm_wakeup_pending()) {
+                dev->power.direct_complete = false;
                 async_error = -EBUSY;
                 goto Complete;
         }