From: Rajendra Nayak <rnayak@codeaurora.org>
To: viresh.kumar@linaro.org, sboyd@kernel.org
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
Rajendra Nayak <rnayak@codeaurora.org>
Subject: [RFC] opp: Fixup release of clock when using set/put clkname
Date: Tue, 14 Apr 2020 12:45:08 +0530 [thread overview]
Message-ID: <1586848508-1320-1-git-send-email-rnayak@codeaurora.org> (raw)
Fixup dev_pm_opp_put_clkname() to check for a valid clock pointer
before it does a clk_put, since its likely that
_opp_table_kref_release() has already done a clk_put. Also fixup
_opp_table_kref_release() to set the clock pointer to ERR_PTR(-EINVAL)
after its done doing a clk_put so dev_pm_opp_put_clkname() can then
catch it.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
drivers/opp/core.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index e4f01e7..6d064a8 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -1061,8 +1061,10 @@ static void _opp_table_kref_release(struct kref *kref)
_of_clear_opp_table(opp_table);
/* Release clk */
- if (!IS_ERR(opp_table->clk))
+ if (!IS_ERR(opp_table->clk)) {
clk_put(opp_table->clk);
+ opp_table->clk = ERR_PTR(-EINVAL);
+ }
WARN_ON(!list_empty(&opp_table->opp_list));
@@ -1744,8 +1746,10 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table)
/* Make sure there are no concurrent readers while updating opp_table */
WARN_ON(!list_empty(&opp_table->opp_list));
- clk_put(opp_table->clk);
- opp_table->clk = ERR_PTR(-EINVAL);
+ if (!IS_ERR(opp_table->clk)) {
+ clk_put(opp_table->clk);
+ opp_table->clk = ERR_PTR(-EINVAL);
+ }
dev_pm_opp_put_opp_table(opp_table);
}
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
next reply other threads:[~2020-04-14 7:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 7:15 Rajendra Nayak [this message]
2020-04-14 7:18 ` [RFC] opp: Fixup release of clock when using set/put clkname Viresh Kumar
2020-04-14 15:05 ` Rajendra Nayak
2020-04-15 5:13 ` Viresh Kumar
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=1586848508-1320-1-git-send-email-rnayak@codeaurora.org \
--to=rnayak@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sboyd@kernel.org \
--cc=viresh.kumar@linaro.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).