diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-04-21 16:08:44 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-22 05:30:34 +0200 |
| commit | 99fba3f8177956170f3d86f83c2cf2f70747105f (patch) | |
| tree | 68fbed1ab095fda709340551707ac40f07c65c80 /drivers/misc | |
| parent | ACPI: thinkpad-acpi: cleanup thermal subdriver for sysfs conversion (diff) | |
| download | linux-99fba3f8177956170f3d86f83c2cf2f70747105f.tar.xz linux-99fba3f8177956170f3d86f83c2cf2f70747105f.zip | |
ACPI: thinkpad-acpi: improve fan watchdog messages
Improve some of the fan watchdog error messages to be a little more
helpful.
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 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index e9aec87a9f09..9b4eea4c8ff7 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c @@ -2524,7 +2524,7 @@ static int fan_get_status(u8 *status) static void fan_exit(void) { - vdbg_printk(TPACPI_DBG_EXIT, "cancelling any pending watchdogs\n"); + vdbg_printk(TPACPI_DBG_EXIT, "cancelling any pending fan watchdog tasks\n"); cancel_delayed_work(&fan_watchdog_task); flush_scheduled_work(); } @@ -2554,9 +2554,13 @@ static int fan_get_speed(unsigned int *speed) static void fan_watchdog_fire(struct work_struct *ignored) { + int rc; + printk(IBM_NOTICE "fan watchdog: enabling fan\n"); - if (fan_set_enable()) { - printk(IBM_ERR "fan watchdog: error while enabling fan\n"); + rc = fan_set_enable(); + if (rc < 0) { + printk(IBM_ERR "fan watchdog: error %d while enabling fan, " + "will try again later...\n", -rc); /* reschedule for later */ fan_watchdog_reset(); } |