Skip to contentSkip to conversation

regression / [PATCH] ACPI: fix fan/thermal resume

PATCH Daniel Ritz 1 participant 1 message Jul 5, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

hi

found another smallish but annoying regression...description/patch below. @intel: please add signed-off-by lines and forward to Linus before 2.6.18 if you argee. @akpm: one round or so in -mm?

thanks, rgds
-daniel

----------------

[PATCH] ACPI fix fan/thermal resume

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.

From: Konstantin Karasyov <[email protected]>

Cc Len Brown <[email protected]>
Cc Sanjoy Mahajan <[email protected]>
Cc Pavel Machek <[email protected]>
drivers/acpi/thermal.c +16 -1
index 503c0b9..fdba487 100644
@@ -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;
 }