OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4985cd0
)
ACPI: thinkpad-acpi: fix a fan watchdog invocation
author
Henrique de Moraes Holschuh
<hmh@hmh.eng.br>
Sat, 28 Apr 2007 01:00:11 +0000
(22:00 -0300)
committer
Len Brown
<len.brown@intel.com>
Sun, 29 Apr 2007 01:41:18 +0000
(21:41 -0400)
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>
drivers/misc/thinkpad_acpi.c
patch
|
blob
|
history
diff --git
a/drivers/misc/thinkpad_acpi.c
b/drivers/misc/thinkpad_acpi.c
index
f824259
..
b85f096
100644
(file)
--- 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);