The patch titled ACPI: fix fan/thermal resume has been added to the -mm tree. Its filename is acpi-fix-fan-thermal-resume.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ACPI: fix fan/thermal resume From: Konstantin Karasyov <konstantin.a.karasyov@xxxxxxxxx> Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx> says: The acpi driver suspend/resume patches that went in recently caused a regression on my box (toshiba tecra 8000 laptop): after resume from swsusp the fan turns on keeping blowing cold air out of my notebook. before the patches, the fan was off and would only make noise when required. it's the same thing described in bugzilla.kernel.org #5000. the acpi suspend/resume patches or at least parts of them originate in this bug. now the last patch in the report (attach id 8438) actually fixes the problem - for me and the reporter. this is a trimmed down version of that patch. Signed-off-by: Daniel Ritz <daniel.ritz@xxxxxx> Cc: Len Brown <len.brown@xxxxxxxxx> Cc: Sanjoy Mahajan <sanjoy@xxxxxxxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/acpi/thermal.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletion(-) diff -puN drivers/acpi/thermal.c~acpi-fix-fan-thermal-resume drivers/acpi/thermal.c --- a/drivers/acpi/thermal.c~acpi-fix-fan-thermal-resume +++ a/drivers/acpi/thermal.c @@ -1359,13 +1359,28 @@ static int acpi_thermal_remove(struct ac static int acpi_thermal_resume(struct acpi_device *device, int state) { struct acpi_thermal *tz = NULL; + int i; if (!device || !acpi_driver_data(device)) return -EINVAL; tz = (struct acpi_thermal *)acpi_driver_data(device); - acpi_thermal_check(tz); + acpi_thermal_get_temperature(tz); + + for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) { + if (tz->trips.active[i].flags.valid) { + tz->temperature = tz->trips.active[i].temperature; + tz->trips.active[i].flags.enabled = 0; + + acpi_thermal_active(tz); + + tz->state.active |= tz->trips.active[i].flags.enabled; + tz->state.active_index = i; + } + } + + acpi_thermal_check(tz); return AE_OK; } _ Patches currently in -mm which might be from konstantin.a.karasyov@xxxxxxxxx are origin.patch acpi-fix-fan-thermal-resume.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html