From 688645d0a8228eec6075148b8b9d69731e121fe4 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sun, 29 Apr 2012 22:52:19 +0200 Subject: [PATCH] --- yaml --- r: 305831 b: refs/heads/master c: 52d136cc2cf6659ee247dbcc88c9e7bd7428ad06 h: refs/heads/master i: 305829: 51eded5c2f24339b1149ba309c98f771364ab27e 305827: 2c15a1d30d650517bb032907dd072225c427ff76 305823: c686062352e72811ba9b5e1f50d3399e86497499 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1bd8c3b74925..5d519763829f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a21d489fd9541a4a66b9a500659abaca1b19a51 +refs/heads/master: 52d136cc2cf6659ee247dbcc88c9e7bd7428ad06 diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c index b462c0e341cb..e0fb5b0435a3 100644 --- a/trunk/drivers/base/power/main.c +++ b/trunk/drivers/base/power/main.c @@ -889,6 +889,11 @@ static int dpm_suspend_noirq(pm_message_t state) if (!list_empty(&dev->power.entry)) list_move(&dev->power.entry, &dpm_noirq_list); put_device(dev); + + if (pm_wakeup_pending()) { + error = -EBUSY; + break; + } } mutex_unlock(&dpm_list_mtx); if (error) @@ -962,6 +967,11 @@ static int dpm_suspend_late(pm_message_t state) if (!list_empty(&dev->power.entry)) list_move(&dev->power.entry, &dpm_late_early_list); put_device(dev); + + if (pm_wakeup_pending()) { + error = -EBUSY; + break; + } } mutex_unlock(&dpm_list_mtx); if (error)