Commit 4dfff3d5 authored Mar 17, 2020 by Jeffy Chen Committed by Greg Kroah-Hartman Mar 18, 2020

arch_topology: Fix putting invalid cpu clk

Add a sanity check before putting the cpu clk.

Fixes: b8fe128d (“arch_topology: Adjust initial CPU capacities with current freq")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Link: https://lore.kernel.org/r/20200317063308.23209-1-jeffy.chen@rock-chips.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 4a33691c

drivers/base/arch_topology.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -164,11 +164,11 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu)
		* frequency (by keeping the initial freq_factor value).
		*/
		cpu_clk = of_clk_get(cpu_node, 0);
		if (!PTR_ERR_OR_ZERO(cpu_clk))
		if (!PTR_ERR_OR_ZERO(cpu_clk)) {
		per_cpu(freq_factor, cpu) =
		clk_get_rate(cpu_clk) / 1000;

		clk_put(cpu_clk);
		}
		} else {
		if (raw_capacity) {
		pr_err("cpu_capacity: missing %pOF raw capacity\n",