diff options
| author | Benoit Goby <benoit@android.com> | 2011-02-07 13:55:26 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:54 -0700 |
| commit | 1b13947f3de59f61e1feb84b9e17812eaba8b807 (patch) | |
| tree | ddf65043c28a9435d8755021655ee4c736bfeb6e /drivers/base | |
| parent | 292b96396c25c465f7f17d5c0d0e182a6b7a4e26 (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>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | 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 4b65d5c64fd2..5720943e715a 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); |