Commit 4dfff3d5 authored by Jeffy Chen's avatar Jeffy Chen Committed by Greg Kroah-Hartman

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: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Link: https://lore.kernel.org/r/20200317063308.23209-1-jeffy.chen@rock-chips.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4a33691c
...@@ -164,11 +164,11 @@ bool __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) ...@@ -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). * frequency (by keeping the initial freq_factor value).
*/ */
cpu_clk = of_clk_get(cpu_node, 0); 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) = per_cpu(freq_factor, cpu) =
clk_get_rate(cpu_clk) / 1000; clk_get_rate(cpu_clk) / 1000;
clk_put(cpu_clk);
clk_put(cpu_clk); }
} else { } else {
if (raw_capacity) { if (raw_capacity) {
pr_err("cpu_capacity: missing %pOF raw capacity\n", pr_err("cpu_capacity: missing %pOF raw capacity\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment