]> err.no Git - linux-2.6/commitdiff
ACPI: thinkpad-acpi: do not arm fan watchdog if it would not work
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Sat, 28 Apr 2007 01:00:10 +0000 (22:00 -0300)
committerLen Brown <len.brown@intel.com>
Sun, 29 Apr 2007 01:41:16 +0000 (21:41 -0400)
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>
drivers/misc/thinkpad_acpi.c

index 7dc3a2206195659c7176bee4bac4065b7fd984d5..f824259fa6116dc405a5bc119b0fb41d4c941aac 100644 (file)
@@ -3197,6 +3197,9 @@ static void fan_watchdog_reset(void)
 {
        static int fan_watchdog_active = 0;
 
+       if (fan_control_access_mode == TPACPI_FAN_WR_NONE)
+               return;
+
        if (fan_watchdog_active)
                cancel_delayed_work(&fan_watchdog_task);