releases/upstream/2.6.22-rc1/0044-ACPI-thinkpad-acpi-fix-a-fan-watchdog-invocation.patch

   1 From ca4ac2f48a4502bbbfcb47b86312273c28194f53 Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Fri, 27 Apr 2007 22:00:11 -0300
   4 Subject: ACPI: thinkpad-acpi: fix a fan watchdog invocation
   5
   6 The fan control watchdog was being called in one place even when the fan
   7 control operation had failed.  Fix it.
   8
   9 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  10 Signed-off-by: Len Brown <len.brown@intel.com>
  11 ---
  12  drivers/misc/thinkpad_acpi.c |    5 +++--
  13  1 files changed, 3 insertions(+), 2 deletions(-)
  14
  15 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  16 index f824259..b85f096 100644
  17 --- a/drivers/misc/thinkpad_acpi.c
  18 +++ b/drivers/misc/thinkpad_acpi.c
  19 @@ -2888,9 +2888,10 @@ static ssize_t fan_pwm1_store(struct device *dev,
  20         if (!rc && (status &
  21                     (TP_EC_FAN_AUTO | TP_EC_FAN_FULLSPEED)) == 0) {
  22                 rc = fan_set_level(newlevel);
  23 -               if (!rc)
  24 +               if (!rc) {
  25                         fan_update_desired_level(newlevel);
  26 -               fan_watchdog_reset();
  27 +                       fan_watchdog_reset();
  28 +               }
  29         }
  30
  31         mutex_unlock(&fan_mutex);
  32 --
  33 1.5.1
  34