---

yaml --- r: 172350 b: refs/heads/master c: 0ddf0ed h: refs/heads/master v: v3
git-mirror · Dec 6, 2009 · ae7aba2 · ae7aba2
1 parent 8739552
commit ae7aba2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63c94801701abfea21570d3302687ec027ed33e8
+refs/heads/master: 0ddf0ed1d47e2d4170fa2989273886a1df66a862
diff --git a/trunk/drivers/base/power/runtime.c b/trunk/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: