Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ca4ac2f48a4502bbbfcb47b86312273c28194f53
Commit: ca4ac2f48a4502bbbfcb47b86312273c28194f53
Parent: 4985cd0a63b0713b6469ef01aae6a0e63ea72f83
Author: Henrique de Moraes Holschuh <[EMAIL PROTECTED]>
AuthorDate: Fri Apr 27 22:00:11 2007 -0300
Committer: Len Brown <[EMAIL PROTECTED]>
CommitDate: Sat Apr 28 21:41:18 2007 -0400
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 <[EMAIL PROTECTED]>
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
drivers/misc/thinkpad_acpi.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index f824259..b85f096 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,
if (!rc && (status &
(TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
rc = fan_set_level(newlevel);
- if (!rc)
+ if (!rc) {
fan_update_desired_level(newlevel);
- fan_watchdog_reset();
+ fan_watchdog_reset();
+ }
}
mutex_unlock(&fan_mutex);
-
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 http://vger.kernel.org/majordomo-info.html
