From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Taniya Das <tdas@codeaurora.org>
Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org
Subject: [PATCH v2 1/2] clk: qcom: fix error_path in gdsc_register
Date: Thu, 1 Jul 2021 01:59:51 +0300 [thread overview]
Message-ID: <20210630225952.3337630-2-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20210630225952.3337630-1-dmitry.baryshkov@linaro.org>
Properly handle and cleanup errors in gdsc_register() instead of just
returning an error and leaving some of resources registered/hanging in
the system.
Fixes: c2c7f0a47493 ("clk: qcom: gdsc: Add support for hierarchical power domains")
Fixes: 45dd0e55317c ("clk: qcom: Add support for GDSCs")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/clk/qcom/gdsc.c | 32 ++++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 4 deletions(-)
diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c
index 51ed640e527b..241186d9d08c 100644
--- a/drivers/clk/qcom/gdsc.c
+++ b/drivers/clk/qcom/gdsc.c
@@ -429,7 +429,7 @@ int gdsc_register(struct gdsc_desc *desc,
scs[i]->rcdev = rcdev;
ret = gdsc_init(scs[i]);
if (ret)
- return ret;
+ goto err_init;
data->domains[i] = &scs[i]->pd;
}
@@ -437,11 +437,35 @@ int gdsc_register(struct gdsc_desc *desc,
for (i = 0; i < num; i++) {
if (!scs[i])
continue;
- if (scs[i]->parent)
- pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd);
+ if (scs[i]->parent) {
+ ret = pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd);
+ if (ret)
+ goto err_subdomain;
+ }
}
- return of_genpd_add_provider_onecell(dev->of_node, data);
+ ret = of_genpd_add_provider_onecell(dev->of_node, data);
+ if (!ret)
+ return 0;
+
+err_subdomain:
+ i--;
+ for (; i >= 0; i--) {
+ if (!scs[i] || !scs[i]->parent)
+ continue;
+ pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd);
+ }
+ i = num;
+
+err_init:
+ i--;
+ for (; i >= 0; i--) {
+ if (!scs[i])
+ continue;
+ pm_genpd_remove(&scs[i]->pd);
+ }
+
+ return ret;
}
void gdsc_unregister(struct gdsc_desc *desc)
--
2.30.2
next prev parent reply other threads:[~2021-06-30 23:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 22:59 [PATCH v2 0/2] clk: qcom: fix error path and cleanup in gdsc support Dmitry Baryshkov
2021-06-30 22:59 ` Dmitry Baryshkov [this message]
2021-06-30 22:59 ` [PATCH v2 2/2] clk: qcom: fix domains cleanup in gdsc_unregister Dmitry Baryshkov
2021-07-01 0:41 ` [PATCH v2 0/2] clk: qcom: fix error path and cleanup in gdsc support Stephen Boyd
2021-08-26 18:36 ` Stephen Boyd
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=20210630225952.3337630-2-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=tdas@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).