Revert "PM: Prevent waiting forever on asynchronous resume after abort"

This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 8984e13c83215f876bbc1a56d4def8ce9cdb6251..06e43912a973cc057d6887342e2c69107f66fe99 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -515,8 +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.status >= DPM_OFF)
-               dpm_wait(dev->parent, async);
+       dpm_wait(dev->parent, async);
        device_lock(dev);
 
        dev->power.in_suspend = false;