Skip to content

Commit a57cc2d

Browse files
spandruvadarafaeljw
authored andcommitted
thermal: intel: int340x: processor_thermal: Fix additional deadlock
Commit 52f04f1 ("thermal: intel: int340x: processor_thermal: Fix deadlock") addressed deadlock issue during user space trip update. But it missed a case when thermal zone device is disabled when user writes 0. Call to thermal_zone_device_disable() also causes deadlock as it also tries to lock tz->lock, which is already claimed by trip_point_temp_store() in the thermal core code. Remove call to thermal_zone_device_disable() in the function sys_set_trip_temp(), which is called from trip_point_temp_store(). Fixes: 52f04f1 ("thermal: intel: int340x: processor_thermal: Fix deadlock") Signed-off-by: Srinivas Pandruvada <[email protected]> Cc: 6.2+ <[email protected]> # 6.2+ Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 197b6b6 commit a57cc2d

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, int temp
153153
cancel_delayed_work_sync(&pci_info->work);
154154
proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_INT_ENABLE_0, 0);
155155
proc_thermal_mmio_write(pci_info, PROC_THERMAL_MMIO_THRES_0, 0);
156-
thermal_zone_device_disable(tzd);
157156
pci_info->stored_thres = 0;
158157
return 0;
159158
}

0 commit comments

Comments
 (0)