From: Ansuel Smith <ansuelsmth@gmail.com>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Sricharan R <sricharan@codeaurora.org>,
linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Ansuel Smith <ansuelsmth@gmail.com>
Subject: [PATCH 3/4] clk: qcom: clk-krait: add hw_parent check for div2_round_rate
Date: Fri, 29 Apr 2022 14:01:07 +0200 [thread overview]
Message-ID: <20220429120108.9396-4-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20220429120108.9396-1-ansuelsmth@gmail.com>
Check if hw_parent is present before calculating the round_rate to
prevent kernel panic. On error -EINVAL is reported.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/clk/qcom/clk-krait.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c
index 90046428693c..6c367ad6506a 100644
--- a/drivers/clk/qcom/clk-krait.c
+++ b/drivers/clk/qcom/clk-krait.c
@@ -84,7 +84,12 @@ EXPORT_SYMBOL_GPL(krait_mux_clk_ops);
static long krait_div2_round_rate(struct clk_hw *hw, unsigned long rate,
unsigned long *parent_rate)
{
- *parent_rate = clk_hw_round_rate(clk_hw_get_parent(hw), rate * 2);
+ struct clk_hw *hw_parent = clk_hw_get_parent(hw);
+
+ if (!hw_parent)
+ return -EINVAL;
+
+ *parent_rate = clk_hw_round_rate(hw_parent, rate * 2);
return DIV_ROUND_UP(*parent_rate, 2);
}
--
2.34.1
next prev parent reply other threads:[~2022-04-29 12:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 12:01 [PATCH 0/4] Small fixes/improvement for hfpll and krait Ansuel Smith
2022-04-29 12:01 ` [PATCH 1/4] clk: qcom: clk-hfpll: use poll_timeout macro Ansuel Smith
2022-04-29 14:42 ` Dmitry Baryshkov
2022-04-29 12:01 ` [PATCH 2/4] clk: qcom: clk-krait: unlock spin after mux completion Ansuel Smith
2022-04-29 14:41 ` Dmitry Baryshkov
2022-04-29 12:01 ` Ansuel Smith [this message]
2022-04-29 14:53 ` [PATCH 3/4] clk: qcom: clk-krait: add hw_parent check for div2_round_rate Dmitry Baryshkov
2022-04-29 15:06 ` Ansuel Smith
2022-04-29 15:22 ` Dmitry Baryshkov
2022-04-29 12:01 ` [PATCH 4/4] clk: qcom: clk-krait: add apq/ipq8064 errata workaround Ansuel Smith
2022-04-29 15:00 ` Dmitry Baryshkov
2022-04-29 15:09 ` Ansuel Smith
2022-04-29 15:13 ` Dmitry Baryshkov
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=20220429120108.9396-4-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=sricharan@codeaurora.org \
/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).