Commit:     4985cd0a63b0713b6469ef01aae6a0e63ea72f83
Parent:     ecf2a80a97b3d38ae008fa8a3cb98cd540ac1eae
Author:     Henrique de Moraes Holschuh <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 27 22:00:10 2007 -0300
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 21:41:16 2007 -0400

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
 drivers/misc/thinkpad_acpi.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 7dc3a22..f824259 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to