summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorXu Qiang <xuqiang36@huawei.com>2022-08-25 06:53:24 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-10-26 13:19:25 +0200
commite0711e18d70faebb5e454970c5b22fbc66f69b27 (patch)
tree542c73cc314c301f60aa763153716bdfb931a3ac /drivers/spi
parent23663a3048d4e24fc43efe489047abf772b872ca (diff)
downloadlinux-stable-e0711e18d70faebb5e454970c5b22fbc66f69b27.tar.gz
linux-stable-e0711e18d70faebb5e454970c5b22fbc66f69b27.tar.bz2
linux-stable-e0711e18d70faebb5e454970c5b22fbc66f69b27.zip
spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime()
[ Upstream commit 494a22765ce479c9f8ad181c5d24cffda9f534bb ] 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> Link: https://lore.kernel.org/r/20220825065324.68446-2-xuqiang36@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-qup.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index c5c727274814..1ca678bcb527 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -1172,8 +1172,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);