Merge "msm: thermal: Update error handling of device offline" (517c1289) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/thermal/msm_thermal.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -2822,7 +2822,7 @@ static void __ref do_core_control(long temp)
		cpu_dev = get_cpu_device(i);
		trace_thermal_pre_core_offline(i);
		ret = device_offline(cpu_dev);
		if (ret)
		if (ret < 0)
		pr_err("Error %d offline core %d\n",
		ret, i);
		trace_thermal_post_core_offline(i,
		@@ -2895,7 +2895,8 @@ static int __ref update_offline_cores(int val)
		cpu_dev = get_cpu_device(cpu);
		trace_thermal_pre_core_offline(cpu);
		ret = device_offline(cpu_dev);
		if (ret) {
		if (ret < 0) {
		cpus_offlined &= ~BIT(cpu);
		pr_err_ratelimited(
		"Unable to offline CPU%d. err:%d\n",
		cpu, ret);
		@@ -2965,6 +2966,14 @@ static __ref int do_hotplug(void *data)
		&hotplug_notify_complete) != 0)
		;
		reinit_completion(&hotplug_notify_complete);

		/*
		* Suspend framework will have disabled the
		* hotplug functionality. So wait till the suspend exits
		* and then re-evaluate.
		*/
		if (in_suspend)
		continue;
		mask = 0;

		mutex_lock(&core_control_mutex);