[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200317001829.29516-1-jeffy.chen@rock-chips.com>
Date: Tue, 17 Mar 2020 08:18:29 +0800
From: Jeffy Chen <jeffy.chen@...k-chips.com>
To: linux-kernel@...r.kernel.org
Cc: anders.roxell@...aro.org, arnd@...db.de, sboyd@...nel.org,
gregkh@...uxfoundation.org, naresh.kamboju@...aro.org,
daniel.lezcano@...aro.org, Basil.Eljuse@....com,
mturquette@...libre.com, Jeffy Chen <jeffy.chen@...k-chips.com>,
Sudeep Holla <sudeep.holla@....com>,
"Rafael J. Wysocki" <rafael@...nel.org>
Subject: [PATCH] arch_topology: Fix putting invalid cpu clk
Add a sanity check before putting the cpu clk.
Fixes: 2a6d1c6bcd1f (“arch_topology: Adjust initial CPU capacities with current freq")
Signed-off-by: Jeffy Chen <jeffy.chen@...k-chips.com>
---
drivers/base/arch_topology.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 8a9fe2bc8635..4d0a0038b476 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -176,11 +176,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);
+ clk_put(cpu_clk);
+ }
} else {
if (raw_capacity) {
pr_err("cpu_capacity: missing %pOF raw capacity\n",
--
2.11.0
Powered by blists - more mailing lists