Skip to content

Commit

Permalink
Merge tag 'thermal-6.3-rc2' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
Linus Torvalds committed Mar 11, 2023
2 parents 55a2110 + 52f04f1 commit a0aefd3
Showing 1 changed file with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit a0aefd3

Please sign in to comment.