| Message ID | 166125855850.401.12486120367006542290.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers | show |
| Series | [thermal:,thermal/next] thermal/core: Fix lockdep_assert() warning | expand |
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 4812170..99c0c19 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1438,9 +1438,6 @@ static int thermal_pm_notify(struct notifier_block *nb, case PM_POST_SUSPEND: atomic_set(&in_suspend, 0); list_for_each_entry(tz, &thermal_tz_list, node) { - if (!thermal_zone_device_is_enabled(tz)) - continue; - thermal_zone_device_init(tz); thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
The following commit has been merged into the thermal/next branch of thermal: Commit-ID: 2f9d142c93c293b2526d63e4e75716945edf0cd2 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//2f9d142c93c293b2526d63e4e75716945edf0cd2 Author: Daniel Lezcano <daniel.lezcano@linaro.org> AuthorDate: Fri, 12 Aug 2022 15:07:43 +02:00 Committer: Daniel Lezcano <daniel.lezcano@linaro.org> CommitterDate: Wed, 17 Aug 2022 14:09:39 +02:00 thermal/core: Fix lockdep_assert() warning The function thermal_zone_device_is_enabled() must be called with the thermal zone lock held. In the resume path, it is called without. As the thermal_zone_device_is_enabled() is also checked in thermal_zone_device_update(), do the check in resume() function is pointless, except for saving an extra initialization which does not hurt if it is done in all the cases. Fixes: ca48ad71717dd ("thermal/core: Move the mutex inside the thermal_zone_device_update() function") Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/thermal/thermal_core.c | 3 --- 1 file changed, 3 deletions(-)