diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-28 22:59:13 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-28 22:59:13 +0200 |
| commit | 9a4768d849d28a79566aa37de19b9852d2da8ec4 (patch) | |
| tree | 155e2cb41e8f12081feefed705a7012d77889e9b | |
| parent | 735e941caa9a35f933297af0ab1e0ad6447411c4 (diff) | |
| parent | f2791d733a2f06997b573d1a3cfde21e6f529826 (diff) | |
Merge branch 'pm-runtime' into linux-next
* pm-runtime:
PM / Runtime: don't forget to wake up waitqueue on failure
| -rw-r--r-- | drivers/base/power/runtime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 541f821d4ea..bd0f3949bcf 100644 --- 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; } |