summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2011-12-13 01:23:52 +0800
committerAndy Green <andy.green@linaro.org>2011-12-26 16:42:44 +0800
commitef55237ba45e12ee5924043df580f70cd3350721 (patch)
tree932da481cfbe774c30e647642c0de9b710fe4d9f
parent4daebb1c38f2ece7218ca06eaed556da3911c548 (diff)
PM: Increase dpm suspend timeout
usbhid devices have a 10s timeout waiting for the out queue to clear. Increased the watchdog to 12s. Change-Id: I96368fca6dff98e4eba8aedb09c23be964c8f4b4 Signed-off-by: Benoit Goby <benoit@android.com>
-rw-r--r--drivers/base/power/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 193e9bcbe70..e232c951e78 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -917,7 +917,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
data.dev = dev;
data.tsk = get_current();
init_timer_on_stack(&timer);
- timer.expires = jiffies + HZ * 3;
+ timer.expires = jiffies + HZ * 12;
timer.function = dpm_drv_timeout;
timer.data = (unsigned long)&data;
add_timer(&timer);