Commit fb2c1024 authored Sep 14, 2023 by Rafael J. Wysocki

thermal: core: Fix disabled trip point check in handle_thermal_trip()



Commit bc840ea5 ("thermal: core: Do not handle trip points with
invalid temperature") added a check for invalid temperature to the
disabled trip point check in handle_thermal_trip(), but that check was
added at a point when the trip structure has not been initialized yet.

This may cause handle_thermal_trip() to skip a valid trip point in some
cases, so fix it by moving the check to a suitable place, after
__thermal_zone_get_trip() has been called to populate the trip
structure.

Fixes: bc840ea5 ("thermal: core: Do not handle trip points with invalid temperature")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent ebc7abb3

drivers/thermal/thermal_core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -348,12 +348,14 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip_id)
		struct thermal_trip trip;

		/* Ignore disabled trip points */
		if (test_bit(trip_id, &tz->trips_disabled) \|\|
		trip.temperature == THERMAL_TEMP_INVALID)
		if (test_bit(trip_id, &tz->trips_disabled))
		return;

		__thermal_zone_get_trip(tz, trip_id, &trip);

		if (trip.temperature == THERMAL_TEMP_INVALID)
		return;

		if (tz->last_temperature != THERMAL_TEMP_INVALID) {
		if (tz->last_temperature < trip.temperature &&
		tz->temperature >= trip.temperature)