From: Rafael J. Wysocki Date: Thu, 28 Sep 2023 15:45:59 +0000 (+0200) Subject: ACPI: thermal: Mark uninitialized active trips as invalid X-Git-Tag: v6.7-rc1~159^2~3^2~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2713b83cb3b0ca78dc16a6968d58bee1342c4bc7;p=thirdparty%2Fkernel%2Flinux.git ACPI: thermal: Mark uninitialized active trips as invalid After removing the valid flag from struct acpi_thermal_trip, the trip temperature value is used in validity checks, so it must be THERMAL_TEMP_INVALID for the active trip entries in struct acpi_thermal_trips that are not going to be used (because the corresponding objects are not present in the ACPI tables, for example). Accordingly, modify acpi_thermal_get_trip_points() to set the temperature value to THERMAL_TEMP_INVALID for trip point entries skipped by it after acpi_thermal_init_trip() has returned 'false' for an active trip. Fixes: 058f5e407deb ("ACPI: thermal: Drop valid flag from struct acpi_thermal_trip") Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index c303688ead714..0c3160c04d655 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -480,6 +480,9 @@ static int acpi_thermal_get_trip_points(struct acpi_thermal *tz) } + while (++i < ACPI_THERMAL_MAX_ACTIVE) + tz->trips.active[i].trip.temperature = THERMAL_TEMP_INVALID; + return count; }