Commit 99fba3f8 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by Len Brown

ACPI: thinkpad-acpi: improve fan watchdog messages

Improve some of the fan watchdog error messages to be a little more
helpful.
Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 04cc862c
...@@ -2524,7 +2524,7 @@ static int fan_get_status(u8 *status) ...@@ -2524,7 +2524,7 @@ static int fan_get_status(u8 *status)
static void fan_exit(void) 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); cancel_delayed_work(&fan_watchdog_task);
flush_scheduled_work(); flush_scheduled_work();
} }
...@@ -2554,9 +2554,13 @@ static int fan_get_speed(unsigned int *speed) ...@@ -2554,9 +2554,13 @@ static int fan_get_speed(unsigned int *speed)
static void fan_watchdog_fire(struct work_struct *ignored) static void fan_watchdog_fire(struct work_struct *ignored)
{ {
int rc;
printk(IBM_NOTICE "fan watchdog: enabling fan\n"); printk(IBM_NOTICE "fan watchdog: enabling fan\n");
if (fan_set_enable()) { rc = fan_set_enable();
printk(IBM_ERR "fan watchdog: error while enabling fan\n"); if (rc < 0) {
printk(IBM_ERR "fan watchdog: error %d while enabling fan, "
"will try again later...\n", -rc);
/* reschedule for later */ /* reschedule for later */
fan_watchdog_reset(); fan_watchdog_reset();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment