From 1b13947f3de59f61e1feb84b9e17812eaba8b807 Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Mon, 7 Feb 2011 13:55:26 -0800 Subject: [PATCH 242/696] 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 --- drivers/base/power/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 4b65d5c..5720943 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -870,7 +870,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); -- 1.7.1