aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-06-20 15:39:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-06-20 15:39:41 -0700
commitc74e2ac2383fd687bf2f8dd3f29f674cbd0cdaea (patch)
treef7578a143f5b12dd0ee6d75b4cb0e3906156c2d0
parent2e30b9734398ad8f29432da63a97728326050536 (diff)
parent0bb619f9227aa370330d2b309733d74750705053 (diff)
downloadlinux-c74e2ac2383fd687bf2f8dd3f29f674cbd0cdaea.tar.gz
Merge tag 'thermal-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki: "Fix a regression introduced during the 6.3 cycle causing intel_soc_dts_iosf to report incorrect temperature values due to a coding mistake (Hans de Goede)" * tag 'thermal-6.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal/intel/intel_soc_dts_iosf: Fix reporting wrong temperatures
-rw-r--r--drivers/thermal/intel/intel_soc_dts_iosf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c
index f99dc7e4ae893..db97499f4f0ab 100644
--- a/drivers/thermal/intel/intel_soc_dts_iosf.c
+++ b/drivers/thermal/intel/intel_soc_dts_iosf.c
@@ -398,7 +398,7 @@ struct intel_soc_dts_sensors *intel_soc_dts_iosf_init(
spin_lock_init(&sensors->intr_notify_lock);
mutex_init(&sensors->dts_update_lock);
sensors->intr_type = intr_type;
- sensors->tj_max = tj_max;
+ sensors->tj_max = tj_max * 1000;
if (intr_type == INTEL_SOC_DTS_INTERRUPT_NONE)
notification = false;
else