Merge "msm: thermal: Register for panic notifier on successful probe" (1be2a3d2) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/thermal/msm_thermal.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -4819,9 +4819,6 @@ int msm_thermal_pre_init(struct device *dev)
		goto pre_init_exit;
		}

		if (!tsens_temp_at_panic)
		msm_thermal_panic_notifier_init(dev);

		if (!thresh) {
		thresh = kzalloc(
		sizeof(struct threshold_info) * MSM_LIST_MAX_NR,
		@@ -4978,6 +4975,7 @@ int msm_thermal_init(struct msm_thermal_data *pdata)
		cpus_previously_online_update();
		register_cpu_notifier(&msm_thermal_cpu_notifier);
		}
		msm_thermal_panic_notifier_init(&pdata->pdev->dev);

		return ret;
		}