From 97ef336a8e86a74bec53dcfa243fb811703a27df Mon Sep 17 00:00:00 2001 From: Eunseok Choi Date: Tue, 5 Dec 2017 20:06:00 +0900 Subject: [PATCH] [9810] thermal: fix recursive mutex_lock by cpu hotplug notifier Change-Id: I303f7a0e3a811f1de728605fa2332c800e445889 Signed-off-by: Eunseok Choi --- drivers/thermal/thermal_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 4ec25e9b21df..c60989baedc8 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -496,8 +496,10 @@ void thermal_zone_device_update(struct thermal_zone_device *tz, for (count = 0; count < tz->trips; count++) handle_thermal_trip(tz, count); - if (tz->ops->throttle_hotplug) - tz->ops->throttle_hotplug(tz); + if (event != THERMAL_DEVICE_POWER_CAPABILITY_CHANGED) { + if (tz->ops->throttle_hotplug) + tz->ops->throttle_hotplug(tz); + } } } EXPORT_SYMBOL_GPL(thermal_zone_device_update); -- 2.20.1