Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-1
+4
-1
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
+4
-1
drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c
···
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;
···
266
267
dev_err(&pdev->dev, "Request IRQ %d failed\n", pdev->irq);
267
268
goto err_free_vectors;
268
269
}
270
+
271
+
ret = thermal_zone_device_enable(pci_info->tzone);
272
+
if (ret)
273
+
goto err_free_vectors;
269
274
270
275
return 0;
271
276