This is a note to let you know that I've just added the patch titled
PM / Sleep: Prevent waiting forever on asynchronous suspend after abort
to the 3.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pm-sleep-prevent-waiting-forever-on-asynchronous-suspend-after-abort.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 1f758b23177d588a71b96ad02990e715949bb82f Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <[email protected]>
Date: Sun, 24 Jun 2012 23:31:09 +0200
Subject: PM / Sleep: Prevent waiting forever on asynchronous suspend after abort
From: Mandeep Singh Baines <[email protected]>
commit 1f758b23177d588a71b96ad02990e715949bb82f upstream.
__device_suspend() must always send a completion. Otherwise, parent
devices will wait forever.
Commit 1e2ef05b, "PM: Limit race conditions between runtime PM and
system sleep (v2)", introduced a regression by short-circuiting the
complete_all() for certain error cases.
This patch fixes the bug by always signalling a completion.
Addresses http://crosbug.com/31972
Tested by injecting an abort.
Signed-off-by: Mandeep Singh Baines <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/base/power/main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1021,7 +1021,7 @@ static int __device_suspend(struct devic
dpm_wait_for_children(dev, async);
if (async_error)
- return 0;
+ goto Complete;
pm_runtime_get_noresume(dev);
if (pm_runtime_barrier(dev) && device_may_wakeup(dev))
@@ -1030,7 +1030,7 @@ static int __device_suspend(struct devic
if (pm_wakeup_pending()) {
pm_runtime_put_sync(dev);
async_error = -EBUSY;
- return 0;
+ goto Complete;
}
device_lock(dev);
@@ -1087,6 +1087,8 @@ static int __device_suspend(struct devic
}
device_unlock(dev);
+
+ Complete:
complete_all(&dev->power.completion);
if (error) {
Patches currently in stable-queue which might be from [email protected] are
queue-3.4/pm-sleep-prevent-waiting-forever-on-asynchronous-suspend-after-abort.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
