[PATCH 3/9] ACPI: thinkpad-acpi: fix a fan watchdog invocation

Henrique de Moraes Holschuh
2007-04-28T01:00:11Z

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-N3TV7GIv+o9fyO9Q7EP/yw@public.gmane.org>
---
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);
--
1.5.1

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.