Revert "PM: Wait for completion of the parent resume before resuming"

This reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06.

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 5720943e715a1cca0e21791dbc51bacdab308dd9..8984e13c83215f876bbc1a56d4def8ce9cdb6251 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -515,7 +515,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async)
        TRACE_DEVICE(dev);
        TRACE_RESUME(0);
 
-       if (dev->parent && dev->parent->power.in_suspend)
+       if (dev->parent && dev->parent->power.status >= DPM_OFF)
                dpm_wait(dev->parent, async);
        device_lock(dev);