1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 02a497e7c785..e5e067091572 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1923,10 +1923,8 @@ static int device_prepare(struct device *dev, pm_message_t state)
 
         dev->power.wakeup_path = false;
 
-        if (dev->power.no_pm_callbacks) {
-                ret = 1;        /* Let device go direct_complete */
+        if (dev->power.no_pm_callbacks)
                 goto unlock;
-        }
 
         if (dev->pm_domain)
                 callback = dev->pm_domain->ops.prepare;
@@ -1960,7 +1958,8 @@ unlock:
          */
         spin_lock_irq(&dev->power.lock);
         dev->power.direct_complete = state.event == PM_EVENT_SUSPEND &&
-                pm_runtime_suspended(dev) && ret > 0 &&
+                ((pm_runtime_suspended(dev) && ret > 0) ||
+                 dev->power.no_pm_callbacks) &&
                 !dev_pm_test_driver_flags(dev, DPM_FLAG_NEVER_SKIP);
         spin_unlock_irq(&dev->power.lock);
         return 0;