PM: Increase dpm suspend timeout
authorBenoit Goby <benoit@android.com>
Mon, 7 Feb 2011 21:55:26 +0000 (13:55 -0800)
committerColin Cross <ccross@android.com>
Tue, 14 Jun 2011 16:09:54 +0000 (09:09 -0700)
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>
drivers/base/power/main.c

index 4b65d5c64fd260846a442e941fb5b0a5f751cf01..5720943e715a1cca0e21791dbc51bacdab308dd9 100644 (file)
@@ -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);