aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-04-27 21:00:10 -0400
committerLen Brown <len.brown@intel.com>2007-04-28 21:41:16 -0400
commit4985cd0a63b0713b6469ef01aae6a0e63ea72f83 (patch)
tree8260c0319aefeea1c1ca00b49ffddbe94d6227ce /drivers/misc
parentecf2a80a97b3d38ae008fa8a3cb98cd540ac1eae (diff)
ACPI: thinkpad-acpi: do not arm fan watchdog if it would not work
Do not enable/rearm the fan control safety watchdog if we would not be able to do anything to the fan anyway. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/thinkpad_acpi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 7dc3a220619..f824259fa61 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -3197,6 +3197,9 @@ static void fan_watchdog_reset(void)
3197{ 3197{
3198 static int fan_watchdog_active = 0; 3198 static int fan_watchdog_active = 0;
3199 3199
3200 if (fan_control_access_mode == TPACPI_FAN_WR_NONE)
3201 return;
3202
3200 if (fan_watchdog_active) 3203 if (fan_watchdog_active)
3201 cancel_delayed_work(&fan_watchdog_task); 3204 cancel_delayed_work(&fan_watchdog_task);
3202 3205