commit e32c14667e4fe9f16ac9b918d15d29abd2315a55
author Colin Cross <ccross@android.com> Wed Jun 29 13:43:12 2011 -0700
committer Colin Cross <ccross@android.com> Wed Jun 29 13:43:12 2011 -0700
tree 10caca50ec1cd2a62645122059a9f0fd14e35368
parent a88985f2b5cc71e524aec001b81f878bed5d29fb

Revert "PM: Prevent waiting forever on asynchronous resume after abort"

This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.

drivers/base/power/main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 8984e13..06e4391 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -515,8 +515,7 @@
 	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;