Commit 7586ac7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e0f8e1a7 cf948c8e

drivers/thermal/intel/x86_pkg_temp_thermal.c

+1 −0
Original line number Diff line number Diff line
@@ -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)