Merge "qcom-cpufreq: Fix hotplug blocking logic" (61507deb) · Commits · e / devices / android_kernel_sony_msm8994

drivers/cpufreq/qcom-cpufreq.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ static struct cpufreq_frequency_table *freq_table;
		static unsigned int *l2_khz;
		static bool is_sync;
		static unsigned long *mem_bw;
		static bool hotplug_ready;

		struct cpufreq_work_struct {
		struct work_struct work;
		@@ -295,7 +296,7 @@ static int msm_cpufreq_cpu_callback(struct notifier_block *nfb,
		int rc;

		/* Fail hotplug until this driver can get CPU clocks */
		if (!cpu_clk[0])
		if (!hotplug_ready)
		return NOTIFY_BAD;

		switch (action & ~CPU_TASKS_FROZEN) {
		@@ -568,6 +569,7 @@ static int __init msm_cpufreq_probe(struct platform_device *pdev)

		if (!cpu_clk[0])
		return -ENODEV;
		hotplug_ready = true;

		ret = cpufreq_parse_dt(dev);
		if (ret)