From ae7aba2e4fea613a2f13ce8085d1639389e884d1 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 3 Dec 2009 21:03:57 +0100 Subject: [PATCH] --- yaml --- r: 172350 b: refs/heads/master c: 0ddf0ed1d47e2d4170fa2989273886a1df66a862 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/power/runtime.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8408bb0fb790..99bb6e5b9cbe 100644 --- 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 index 6e8577d1f750..637706951885 100644 --- 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: