git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()
[pandora-kernel.git]
/
drivers
/
base
/
power
/
runtime.c
diff --git
a/drivers/base/power/runtime.c
b/drivers/base/power/runtime.c
index
6e8577d
..
6377069
100644
(file)
--- a/
drivers/base/power/runtime.c
+++ b/
drivers/base/power/runtime.c
@@
-625,6
+625,8
@@
int pm_schedule_suspend(struct device *dev, unsigned int delay)
goto out;
dev->power.timer_expires = jiffies + msecs_to_jiffies(delay);
+ if (!dev->power.timer_expires)
+ dev->power.timer_expires = 1;
mod_timer(&dev->power.suspend_timer, dev->power.timer_expires);
out: