diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-23 09:47:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-05-23 09:47:43 -0700 |
| commit | 7586ac7c340c3672f116052c1d150f134810965b (patch) | |
| tree | 20a79f6e874ec2fad000e4092b31d6b88ea25dce | |
| parent | e0f8e1a7c18bfbb203122e98dbd08e0e68dcbd76 (diff) | |
| parent | cf948c8e274e8b406e846cdf6cc48fe47f98cf57 (diff) | |
Merge tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki:
"This fixes a coding mistake in the x86_pkg_temp_thermal Intel thermal
driver that was introduced by an incorrect conflict resolution during
a merge (Zhang Rui)"
* tag 'thermal-6.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature
| -rw-r--r-- | drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c index 496abf8e55e0d..2841d14914b71 100644 --- a/drivers/thermal/intel/x86_pkg_temp_thermal.c +++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c @@ -329,6 +329,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu) tj_max = intel_tcc_get_tjmax(cpu); if (tj_max < 0) return tj_max; + tj_max *= 1000; zonedev = kzalloc(sizeof(*zonedev), GFP_KERNEL); if (!zonedev) |