From: Colin Cross <ccross@android.com>
Date: Wed, 29 Jun 2011 20:42:56 +0000 (-0700)
Subject: Revert "PM: Wait for completion of the parent resume before resuming"
X-Git-Tag: firefly_0821_release~7613^2~575
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a88985f2b5cc71e524aec001b81f878bed5d29fb;p=firefly-linux-kernel-4.4.55.git

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 5720943e715a..8984e13c8321 100644
--- 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);