diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-19 09:41:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-04-19 09:41:57 -0700 |
| commit | dbe0a7be283829566c966642c739e820e0be1081 (patch) | |
| tree | e44d5d3a42ec031e123a2e30fd1cde8022e35817 | |
| parent | 3c08ab6dad97da8e2acffb64e0a93a0e52c56a37 (diff) | |
| parent | b552f63cd43735048bbe9bfbb7a9dcfce166fbdd (diff) | |
| download | linux-dbe0a7be283829566c966642c739e820e0be1081.tar.gz | |
Merge tag 'thermal-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki:
"This prevents the thermal debug code from attempting to divide by zero
and corrects trip point statistics (Rafael Wysocki)"
* tag 'thermal-6.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal/debugfs: Add missing count increment to thermal_debug_tz_trip_up()
| -rw-r--r-- | drivers/thermal/thermal_debugfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_debugfs.c b/drivers/thermal/thermal_debugfs.c index c617e8b9f0ddfe..d78d54ae2605e8 100644 --- a/drivers/thermal/thermal_debugfs.c +++ b/drivers/thermal/thermal_debugfs.c @@ -616,6 +616,7 @@ void thermal_debug_tz_trip_up(struct thermal_zone_device *tz, tze->trip_stats[trip_id].timestamp = now; tze->trip_stats[trip_id].max = max(tze->trip_stats[trip_id].max, temperature); tze->trip_stats[trip_id].min = min(tze->trip_stats[trip_id].min, temperature); + tze->trip_stats[trip_id].count++; tze->trip_stats[trip_id].avg = tze->trip_stats[trip_id].avg + (temperature - tze->trip_stats[trip_id].avg) / tze->trip_stats[trip_id].count; |