From: Xu Qiang <xuqiang36@huawei.com>
To: <agross@kernel.org>, <bjorn.andersson@linaro.org>,
<konrad.dybcio@somainline.org>, <broonie@kernel.org>,
<iivanov@mm-sol.com>, <pramod.gurav@linaro.org>
Cc: <linux-arm-msm@vger.kernel.org>, <linux-spi@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <guohanjun@huawei.com>,
<weiyongjun1@huawei.com>, <xuqiang36@huawei.com>
Subject: [PATCH -next 2/2] spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime()
Date: Thu, 25 Aug 2022 06:53:24 +0000 [thread overview]
Message-ID: <20220825065324.68446-2-xuqiang36@huawei.com> (raw)
In-Reply-To: <20220825065324.68446-1-xuqiang36@huawei.com>
Add the missing clk_disable_unprepare() before return
from spi_qup_pm_resume_runtime() in the error handling case.
Fixes: dae1a7700b34 (“spi: qup: Handle clocks in pm_runtime suspend and resume”)
Signed-off-by: Xu Qiang <xuqiang36@huawei.com>
---
drivers/spi/spi-qup.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index ae4e67f152ec..7d89510dc3f0 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -1198,8 +1198,10 @@ static int spi_qup_pm_resume_runtime(struct device *device)
return ret;
ret = clk_prepare_enable(controller->cclk);
- if (ret)
+ if (ret) {
+ clk_disable_unprepare(controller->iclk);
return ret;
+ }
/* Disable clocks auto gaiting */
config = readl_relaxed(controller->base + QUP_CONFIG);
--
2.17.1
next prev parent reply other threads:[~2022-08-25 6:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 6:53 [PATCH -next 1/2] spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume() Xu Qiang
2022-08-25 6:53 ` Xu Qiang [this message]
2022-09-05 17:33 ` Mark Brown
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=20220825065324.68446-2-xuqiang36@huawei.com \
--to=xuqiang36@huawei.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=guohanjun@huawei.com \
--cc=iivanov@mm-sol.com \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=pramod.gurav@linaro.org \
--cc=weiyongjun1@huawei.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).