From 0e06b4a891c6a108412fe24b4500f499da2cf8a1 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 23 Jan 2010 22:25:15 +0100
Subject: PM: Add a switch for disabling/enabling asynchronous suspend/resume
Add sysfs attribute /sys/power/pm_async allowing the user space to
disable/enable asynchronous suspend/resume of devices.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/base/power/main.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
(limited to 'drivers/base/power/main.c')
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3b44c201dda..7e79201b09b 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -201,7 +201,7 @@ static void dpm_wait(struct device *dev, bool async)
if (!dev)
return;
- if (async || dev->power.async_suspend)
+ if (async || (pm_async_enabled && dev->power.async_suspend))
wait_for_completion(&dev->power.completion);
}
@@ -563,7 +563,8 @@ static int device_resume(struct device *dev)
{
INIT_COMPLETION(dev->power.completion);
- if (dev->power.async_suspend && !pm_trace_is_enabled()) {
+ if (pm_async_enabled && dev->power.async_suspend
+ && !pm_trace_is_enabled()) {
get_device(dev);
async_schedule(async_resume, dev);
return 0;
@@ -867,7 +868,7 @@ static int device_suspend(struct device *dev)
{
INIT_COMPLETION(dev->power.completion);
- if (dev->power.async_suspend) {
+ if (pm_async_enabled && dev->power.async_suspend) {
get_device(dev);
async_schedule(async_suspend, dev);
return 0;
--
cgit v1.2.3-70-g09d2