From: Johan Hovold <johan+linaro@kernel.org>
To: Georgi Djakov <djakov@kernel.org>
Cc: "Shawn Guo" <shawnguo@kernel.org>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"Fabio Estevam" <festevam@gmail.com>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Andy Gross" <agross@kernel.org>,
"Bjorn Andersson" <andersson@kernel.org>,
"Konrad Dybcio" <konrad.dybcio@linaro.org>,
"Sylwester Nawrocki" <s.nawrocki@samsung.com>,
"Artur Świgoń" <a.swigon@samsung.com>,
"Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org>,
"Alim Akhtar" <alim.akhtar@samsung.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org,
"Johan Hovold" <johan+linaro@kernel.org>,
stable@vger.kernel.org,
"Yassine Oudjana" <y.oudjana@protonmail.com>
Subject: [PATCH 07/23] interconnect: qcom: rpm: fix probe PM domain error handling
Date: Wed, 1 Feb 2023 11:15:43 +0100 [thread overview]
Message-ID: <20230201101559.15529-8-johan+linaro@kernel.org> (raw)
In-Reply-To: <20230201101559.15529-1-johan+linaro@kernel.org>
Make sure to disable clocks also in case attaching the power domain
fails.
Fixes: 7de109c0abe9 ("interconnect: icc-rpm: Add support for bus power domain")
Cc: stable@vger.kernel.org # 5.17
Cc: Yassine Oudjana <y.oudjana@protonmail.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/interconnect/qcom/icc-rpm.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
index 91778cfcbc65..da595059cafd 100644
--- a/drivers/interconnect/qcom/icc-rpm.c
+++ b/drivers/interconnect/qcom/icc-rpm.c
@@ -498,8 +498,7 @@ int qnoc_probe(struct platform_device *pdev)
if (desc->has_bus_pd) {
ret = dev_pm_domain_attach(dev, true);
- if (ret)
- return ret;
+ goto err_disable_clks;
}
provider = &qp->provider;
@@ -514,8 +513,7 @@ int qnoc_probe(struct platform_device *pdev)
ret = icc_provider_add(provider);
if (ret) {
dev_err(dev, "error adding interconnect provider: %d\n", ret);
- clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);
- return ret;
+ goto err_disable_clks;
}
for (i = 0; i < num_nodes; i++) {
@@ -550,8 +548,9 @@ int qnoc_probe(struct platform_device *pdev)
return 0;
err:
icc_nodes_remove(provider);
- clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);
icc_provider_del(provider);
+err_disable_clks:
+ clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks);
return ret;
}
--
2.39.1
next prev parent reply other threads:[~2023-02-01 10:16 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230201101559.15529-1-johan+linaro@kernel.org>
2023-02-01 10:15 ` [PATCH 01/23] interconnect: fix mem leak when freeing nodes Johan Hovold
2023-02-01 11:18 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 02/23] interconnect: fix icc_provider_del() error handling Johan Hovold
2023-02-01 11:16 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 03/23] interconnect: fix provider registration API Johan Hovold
2023-02-03 2:48 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 04/23] interconnect: imx: fix registration race Johan Hovold
2023-02-03 2:49 ` Konrad Dybcio
2023-02-03 16:01 ` Luca Ceresoli
2023-02-06 8:09 ` Johan Hovold
2023-02-06 20:52 ` Luca Ceresoli
2023-02-01 10:15 ` [PATCH 05/23] interconnect: qcom: osm-l3: " Johan Hovold
2023-02-03 2:51 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 06/23] interconnect: qcom: rpm: fix probe child-node error handling Johan Hovold
2023-02-03 2:52 ` Konrad Dybcio
2023-02-01 10:15 ` Johan Hovold [this message]
2023-02-03 2:53 ` [PATCH 07/23] interconnect: qcom: rpm: fix probe PM domain " Konrad Dybcio
2023-03-11 18:17 ` Christophe JAILLET
2023-03-13 8:18 ` Johan Hovold
2023-02-01 10:15 ` [PATCH 08/23] interconnect: qcom: rpm: fix registration race Johan Hovold
2023-02-03 2:53 ` Konrad Dybcio
2023-02-03 4:06 ` Jun Nie
2023-02-01 10:15 ` [PATCH 09/23] interconnect: qcom: rpmh: fix probe child-node error handling Johan Hovold
2023-02-03 2:54 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 10/23] interconnect: qcom: rpmh: fix registration race Johan Hovold
2023-02-03 2:55 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 11/23] interconnect: qcom: msm8974: " Johan Hovold
2023-02-02 23:13 ` Brian Masney
2023-02-03 2:56 ` Konrad Dybcio
2023-02-01 10:15 ` [PATCH 12/23] interconnect: qcom: sm8450: " Johan Hovold
2023-02-03 2:56 ` Konrad Dybcio
2023-02-06 12:10 ` Vinod Koul
2023-02-01 10:15 ` [PATCH 14/23] interconnect: exynos: fix node leak in probe PM QoS error path Johan Hovold
2023-02-02 10:58 ` Krzysztof Kozlowski
2023-02-01 10:15 ` [PATCH 15/23] interconnect: exynos: fix registration race Johan Hovold
2023-02-02 11:04 ` Krzysztof Kozlowski
2023-02-02 12:17 ` Johan Hovold
2023-02-02 12:20 ` Krzysztof Kozlowski
2023-02-01 10:15 ` [PATCH 17/23] memory: tegra: fix interconnect " Johan Hovold
2023-02-02 12:21 ` Krzysztof Kozlowski
2023-02-01 10:15 ` [PATCH 18/23] memory: tegra124-emc: " Johan Hovold
2023-02-02 12:21 ` Krzysztof Kozlowski
2023-02-01 10:15 ` [PATCH 19/23] memory: tegra20-emc: " Johan Hovold
2023-02-02 12:21 ` Krzysztof Kozlowski
2023-02-01 10:15 ` [PATCH 20/23] memory: tegra30-emc: " Johan Hovold
2023-02-02 12:21 ` Krzysztof Kozlowski
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=20230201101559.15529-8-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=a.swigon@samsung.com \
--cc=agross@kernel.org \
--cc=alim.akhtar@samsung.com \
--cc=andersson@kernel.org \
--cc=djakov@kernel.org \
--cc=festevam@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=kernel@pengutronix.de \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=s.nawrocki@samsung.com \
--cc=shawnguo@kernel.org \
--cc=stable@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=y.oudjana@protonmail.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).