summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2011-10-09 02:23:47 +0100
committerAndy Green <andy.green@linaro.org>2011-10-09 02:23:47 +0100
commit0a4098ed7b046457b41178271792b77405bfdb37 (patch)
tree7ce8898a83f270d3d44e4b88271a9e5c859f3158
parentce0be156cdd342e1cd226642a728aca53a2308ae (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 80b9a013b1b..addc8c87e6f 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -902,7 +902,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);