Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] ACPI: fix fan/thermal resume

Browse Source 
Daniel Ritz <daniel.ritz-ml@swissonline.ch> 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@gmx.ch>
Cc: Len Brown <len.brown@intel.com>
Cc: Sanjoy Mahajan <sanjoy@mrao.cam.ac.uk>
Cc: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Konstantin Karasyov 2006-07-10 04:44:26 -07:00 committed by Linus Torvalds
parent 868e81b8ad
commit bed936f7ea
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/acpi/thermal.c
View File

@ -1359,13 +1359,28 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
static int acpi_thermal_resume(struct acpi_device *device, int state) static int acpi_thermal_resume(struct acpi_device *device, int state)
{ {
struct acpi_thermal *tz = NULL; struct acpi_thermal *tz = NULL;
int i;
if (!device || !acpi_driver_data(device)) if (!device || !acpi_driver_data(device))
return -EINVAL; return -EINVAL;
tz = (struct acpi_thermal *)acpi_driver_data(device); 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; return AE_OK;
} }