summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2011-10-30 23:02:50 +0800
committerAndy Green <andy.green@linaro.org>2011-11-11 18:39:02 +0800
commit6d4dcef196604c8dd2bee0f75dee530c3f49e47a (patch)
treec3500a742c9528c31bfd65b52d75d72bcb029038
parentc5242bdba036d6fd613c6dccab51d9f82d95ca63 (diff)
downloadpanda-6d4dcef196604c8dd2bee0f75dee530c3f49e47a.tar.gz
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 5430cb672a7..788e6ad08c4 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -916,7 +916,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);