diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-04-23 23:41:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-24 17:23:08 +0200 |
| commit | 94e22e13ad063c614b458a019b428ffc118e5c06 (patch) | |
| tree | 0153b6823516f3be23ab633ea08fb45561fab034 /drivers | |
| parent | v9fs: don't use primary fid when removing file (diff) | |
| download | linux-94e22e13ad063c614b458a019b428ffc118e5c06.tar.xz linux-94e22e13ad063c614b458a019b428ffc118e5c06.zip | |
acpi-thermal: fix mod_timer() interval
Use relative time, not absolute. Discovered by Jung-Ik (John) Lee
<jilee@google.com>.
Cc: Jung-Ik (John) Lee <jilee@google.com>
Acked-by: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/thermal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 0ae8b9310cbf..589b98b7b216 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -758,7 +758,8 @@ static void acpi_thermal_check(void *data) del_timer(&(tz->timer)); } else { if (timer_pending(&(tz->timer))) - mod_timer(&(tz->timer), (HZ * sleep_time) / 1000); + mod_timer(&(tz->timer), + jiffies + (HZ * sleep_time) / 1000); else { tz->timer.data = (unsigned long)tz; tz->timer.function = acpi_thermal_run; |