projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pci-quirks: disable MSI on RS400-200 and RS480
[powerpc.git]
/
drivers
/
acpi
/
thermal.c
diff --git
a/drivers/acpi/thermal.c
b/drivers/acpi/thermal.c
index
0ae8b93
..
589b98b
100644
(file)
--- 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)))
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;
else {
tz->timer.data = (unsigned long)tz;
tz->timer.function = acpi_thermal_run;