From: Eunseok Choi <es10.choi@samsung.com>
Date: Tue, 5 Dec 2017 11:06:00 +0000 (+0900)
Subject: [9810] thermal: fix recursive mutex_lock by cpu hotplug notifier
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=97ef336a8e86a74bec53dcfa243fb811703a27df;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[9810] thermal: fix recursive mutex_lock by cpu hotplug notifier

Change-Id: I303f7a0e3a811f1de728605fa2332c800e445889
Signed-off-by: Eunseok Choi <es10.choi@samsung.com>
---

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);