Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4046e33f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: cpu_cooling: Use Policy cpu as cdev ID"

parents 0275af0b 5d5dcb35

drivers/thermal/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o 
obj-y				+= intel/

obj-$(CONFIG_TI_SOC_THERMAL)	+= ti-soc-thermal/

obj-y				+= st/

obj-$(CONFIG_QCOM_TSENS)	+= qcom/

obj-$(CONFIG_ARCH_QCOM)	+= qcom/

obj-y				+= tegra/

obj-$(CONFIG_HISI_THERMAL)     += hisi_thermal.o

obj-$(CONFIG_MTK_THERMAL)	+= mtk_thermal.o

drivers/thermal/cpu_cooling.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ __cpufreq_cooling_register(struct device_node *np, 
		cdev = ERR_PTR(ret);

		goto free_table;

	}

	cpufreq_cdev->id = ret;

	cpufreq_cdev->id = policy->cpu;



	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",

		 cpufreq_cdev->id);