From: Colin Cross <ccross@android.com>
Date: Wed, 29 Jun 2011 20:43:12 +0000 (-0700)
Subject: Revert "PM: Prevent waiting forever on asynchronous resume after abort"
X-Git-Tag: firefly_0821_release~7613^2~574
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e32c14667e4fe9f16ac9b918d15d29abd2315a55;p=firefly-linux-kernel-4.4.55.git

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 8984e13c8321..06e43912a973 100644
--- 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;