summaryrefslogtreecommitdiff
path: root/drivers/thermal/tegra
diff options
context:
space:
mode:
authorJohan Hovold <johan+linaro@kernel.org>2022-12-14 14:16:16 +0100
committerDaniel Lezcano <daniel.lezcano@kernel.org>2023-01-06 14:14:48 +0100
commitb0b5d063d66e85c24c32bf169fe4879bf08ea580 (patch)
tree55a1ddb903395ae2c3fd1240c54b08937b0fbe41 /drivers/thermal/tegra
parente6ec64f85237b48c071158617cfc954a30285fc7 (diff)
thermal/drivers/tegra: Fix set_trip_temp() deadlock
The set_trip_temp() callback is used when changing the trip temperature through sysfs. As it is called with the thermal-zone-device lock held it must not use thermal_zone_get_trip() directly or it will deadlock. Fixes: 56d7b397cc29 ("thermal/drivers/tegra: Use generic thermal_zone_get_trip() function") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20221214131617.2447-4-johan+linaro@kernel.org Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
Diffstat (limited to 'drivers/thermal/tegra')
-rw-r--r--drivers/thermal/tegra/soctherm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c
index 4203e74e2f79..220873298d77 100644
--- a/drivers/thermal/tegra/soctherm.c
+++ b/drivers/thermal/tegra/soctherm.c
@@ -594,7 +594,7 @@ static int tegra_thermctl_set_trip_temp(struct thermal_zone_device *tz, int trip
if (!tz)
return -EINVAL;
- ret = thermal_zone_get_trip(tz, trip_id, &trip);
+ ret = __thermal_zone_get_trip(tz, trip_id, &trip);
if (ret)
return ret;