Revert "PM: Prevent waiting forever on asynchronous resume after abort"
Colin Cross [Wed, 29 Jun 2011 20:43:12 +0000 (13:43 -0700)]
This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.

drivers/base/power/main.c

index 13518a1..7b4b78a 100644 (file)
@@ -517,8 +517,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);
 
        /*