aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-04-27 21:00:11 -0400
committerLen Brown <len.brown@intel.com>2007-04-28 21:41:18 -0400
commitca4ac2f48a4502bbbfcb47b86312273c28194f53 (patch)
treea0403f74925a04b785903d6c8eb4b3432ae46b52 /drivers
parent4985cd0a63b0713b6469ef01aae6a0e63ea72f83 (diff)
ACPI: thinkpad-acpi: fix a fan watchdog invocation
The fan control watchdog was being called in one place even when the fan control operation had failed. Fix it. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/thinkpad_acpi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index f824259fa611..b85f0960e608 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -2888,9 +2888,10 @@ static ssize_t fan_pwm1_store(struct device *dev,
2888 if (!rc && (status & 2888 if (!rc && (status &
2889 (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) { 2889 (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
2890 rc = fan_set_level(newlevel); 2890 rc = fan_set_level(newlevel);
2891 if (!rc) 2891 if (!rc) {
2892 fan_update_desired_level(newlevel); 2892 fan_update_desired_level(newlevel);
2893 fan_watchdog_reset(); 2893 fan_watchdog_reset();
2894 }
2894 } 2895 }
2895 2896
2896 mutex_unlock(&fan_mutex); 2897 mutex_unlock(&fan_mutex);