Merge "cpufreq: qcom: Add null pointer check for get_cpu_device" (2a98f234) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/cpufreq/qcom-cpufreq-hw.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0-only		// SPDX-License-Identifier: GPL-2.0-only
	/*		/*
	* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.		* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/cpufreq.h>		#include <linux/cpufreq.h>
	@@ -364,7 +364,7 @@ static struct cpufreq_driver cpufreq_qcom_hw_driver = {
	static int qcom_cpufreq_hw_read_lut(struct platform_device *pdev,		static int qcom_cpufreq_hw_read_lut(struct platform_device *pdev,
	struct cpufreq_qcom *c)		struct cpufreq_qcom *c)
	{		{
	struct device *dev = &pdev->dev;		struct device dev = &pdev->dev, cpu_dev;
	void __iomem base_freq, base_volt;		void __iomem base_freq, base_volt;
	u32 data, src, lval, i, core_count, prev_cc, prev_freq, cur_freq, volt;		u32 data, src, lval, i, core_count, prev_cc, prev_freq, cur_freq, volt;
	u32 vc;		u32 vc;
	@@ -417,8 +417,12 @@ static int qcom_cpufreq_hw_read_lut(struct platform_device *pdev,
	prev_freq = cur_freq;		prev_freq = cur_freq;

	cur_freq *= 1000;		cur_freq *= 1000;
	for_each_cpu(cpu, &c->related_cpus)		for_each_cpu(cpu, &c->related_cpus) {
	dev_pm_opp_add(get_cpu_device(cpu), cur_freq, volt);		cpu_dev = get_cpu_device(cpu);
			if (!cpu_dev)
			continue;
			dev_pm_opp_add(cpu_dev, cur_freq, volt);
			}
	}		}

	c->table[i].frequency = CPUFREQ_TABLE_END;		c->table[i].frequency = CPUFREQ_TABLE_END;