Revert "PM: Wait for completion of the parent resume before resuming"
Colin Cross [Wed, 29 Jun 2011 20:42:56 +0000 (13:42 -0700)]
This reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06.

drivers/base/power/main.c

index 6f4e855..13518a1 100644 (file)
@@ -517,7 +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.in_suspend)
+       if (dev->parent && dev->parent->power.status >= DPM_OFF)
                dpm_wait(dev->parent, async);
        device_lock(dev);