diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-04-27 22:00:11 -0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-28 21:41:18 -0400 |
| commit | ca4ac2f48a4502bbbfcb47b86312273c28194f53 (patch) | |
| tree | a0403f74925a04b785903d6c8eb4b3432ae46b52 /drivers/misc | |
| parent | 4985cd0a63b0713b6469ef01aae6a0e63ea72f83 (diff) | |
| download | blackbird-op-linux-ca4ac2f48a4502bbbfcb47b86312273c28194f53.tar.gz blackbird-op-linux-ca4ac2f48a4502bbbfcb47b86312273c28194f53.zip | |
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/misc')
| -rw-r--r-- | 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 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, 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); |
