Commit a0aefd30 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control fix from Rafael Wysocki:
 "Fix a recently introduced deadlock in the int340x thermal control
  driver (Srinivas Pandruvada)"

* tag 'thermal-6.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: intel: int340x: processor_thermal: Fix deadlock
parents 55a21105 52f04f10

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

+4 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp 
	proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, _temp);

	proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 1);



	thermal_zone_device_enable(tzd);

	pci_info->stored_thres = temp;



	return 0;
@@ -268,6 +267,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_ 
		goto err_free_vectors;

	}



	ret = thermal_zone_device_enable(pci_info->tzone);

	if (ret)

		goto err_free_vectors;



	return 0;



err_free_vectors: