From c276108fd17c700a067e01c58063e7ad4c41dcef Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 29 Jun 2011 13:42:56 -0700 Subject: Revert "PM: Wait for completion of the parent resume before resuming" This reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06. --- drivers/base/power/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 6f4e855c5533..13518a1067d5 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -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); -- cgit v1.2.3