From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 10 Jul 2024 11:01:38 +0000 (+0200)
Subject: Merge back thermal control material for 6.11.
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=462be1c353400fa0bdd34c19897cf001ba6a5f60;p=linux.git

Merge back thermal control material for 6.11.
---

462be1c353400fa0bdd34c19897cf001ba6a5f60
diff --cc drivers/thermal/thermal_core.c
index ecc748d15eb7,2aa04c46a425..3c03d657d98c
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@ -511,16 -514,16 +514,16 @@@ void __thermal_zone_device_update(struc
  	update_temperature(tz);
  
  	if (tz->temperature == THERMAL_TEMP_INVALID)
 -		return;
 +		goto monitor;
  
- 	__thermal_zone_set_trips(tz);
- 
  	tz->notify_event = event;
  
  	for_each_trip_desc(tz, td)
  		handle_thermal_trip(tz, td, &way_up_list, &way_down_list);
  
+ 	thermal_zone_set_trips(tz);
+ 
 -	list_sort(&way_up_list, &way_up_list, thermal_trip_notify_cmp);
 +	list_sort(NULL, &way_up_list, thermal_trip_notify_cmp);
  	list_for_each_entry(td, &way_up_list, notify_list_node)
  		thermal_trip_crossed(tz, &td->trip, governor, true);