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
Unified · Split
| @@ -166,7 +166,6 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp · 165 unmodified lines | ||
| 166 | 166 | proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, _temp); |
| 167 | 167 | proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 1); |
| 168 | 168 | |
| 169 | − thermal_zone_device_enable(tzd); | |
| 170 | 169 | pci_info->stored_thres = temp; |
| 171 | 170 | |
| 172 | 171 | return 0; |
| @@ -268,6 +267,10 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_ · 95 unmodified lines | ||
| 268 | 267 | goto err_free_vectors; |
| 269 | 268 | } |
| 270 | 269 | |
| 270 | + ret = thermal_zone_device_enable(pci_info->tzone); | |
| 271 | + if (ret) | |
| 272 | + goto err_free_vectors; | |
| 273 | + | |
| 271 | 274 | return 0; |
| 272 | 275 | |
| 273 | 276 | err_free_vectors: |