Commit 0ddf0ed1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

PM / Runtime: Ensure timer_expires is nonzero in pm_schedule_suspend()

The runtime PM core code assumes that dev->power.timer_expires is
nonzero when the timer is scheduled, but it may become zero
incidentally in pm_schedule_suspend().  Prevent this from happening
by bumping dev->power.timer_expires up to 1 if it's 0 before calling
mod_timer().
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reported-by: default avatarAlan Stern <stern@rowland.harvard.edu>
parent 63c94801
...@@ -625,6 +625,8 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay) ...@@ -625,6 +625,8 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay)
goto out; goto out;
dev->power.timer_expires = jiffies + msecs_to_jiffies(delay); 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); mod_timer(&dev->power.suspend_timer, dev->power.timer_expires);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment