diff options
| author | Benoit Goby <benoit@android.com> | 2011-02-07 13:55:26 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:29 -0800 |
| commit | 607f3cf8450054189ccedd18ae0c58e4d816b232 (patch) | |
| tree | 218ab6c590d6f44d17238baff98c809b5c67a534 /drivers/base/power/main.c | |
| parent | 098c3126be67476f558f26fd605f8a446616171f (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/power/main.c')
| -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 18d66624b499..6f4e855c5533 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -889,7 +889,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); |