Merge branch 'pm-runtime' into linux-next

* pm-runtime: PM / Runtime: don't forget to wake up waitqueue on failure
cm12-amami · Mar 28, 2012 · 9a4768d · 9a4768d
2 parents 735e941 + f2791d7
commit 9a4768d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
@@ -532,6 +532,8 @@ static int rpm_suspend(struct device *dev, int rpmflags)
 	dev->power.suspend_time = ktime_set(0, 0);
 	dev->power.max_time_suspended_ns = -1;
 	dev->power.deferred_resume = false;
+	wake_up_all(&dev->power.wait_queue);
+
 	if (retval == -EAGAIN || retval == -EBUSY) {
 		dev->power.runtime_error = 0;
 
@@ -547,7 +549,6 @@ static int rpm_suspend(struct device *dev, int rpmflags)
 	} else {
 		pm_runtime_cancel_pending(dev);
 	}
-	wake_up_all(&dev->power.wait_queue);
 	goto out;
 }