From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: anders.roxell@linaro.org, arnd@arndb.de, sboyd@kernel.org,
gregkh@linuxfoundation.org, naresh.kamboju@linaro.org,
daniel.lezcano@linaro.org, Basil.Eljuse@arm.com,
mturquette@baylibre.com, Jeffy Chen <jeffy.chen@rock-chips.com>,
Sudeep Holla <sudeep.holla@arm.com>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH] arch_topology: Fix putting invalid cpu clk
Date: Tue, 17 Mar 2020 08:18:29 +0800 [thread overview]
Message-ID: <20200317001829.29516-1-jeffy.chen@rock-chips.com> (raw)
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@rock-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
next reply other threads:[~2020-03-17 0:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 0:18 Jeffy Chen [this message]
2020-03-17 6:24 ` [PATCH] arch_topology: Fix putting invalid cpu clk Sudeep Holla
2020-03-17 6:34 ` JeffyChen
2020-03-17 6:35 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200317001829.29516-1-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=Basil.Eljuse@arm.com \
--cc=anders.roxell@linaro.org \
--cc=arnd@arndb.de \
--cc=daniel.lezcano@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=naresh.kamboju@linaro.org \
--cc=rafael@kernel.org \
--cc=sboyd@kernel.org \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).