xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime()

Browse Source 
[ Upstream commit 494a22765ce479c9f8ad181c5d24cffda9f534bb ]

Add the missing clk_disable_unprepare() before return
from spi_qup_pm_resume_runtime() in the error handling case.

Fixes: dae1a7700b (“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>
This commit is contained in:
Xu Qiang
2022-08-25 06:53:24 +00:00
committed by Greg Kroah-Hartman
parent 7b83d11d48
commit 1e91179057
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-qup.c
View File

@@ -1199,8 +1199,10 @@ static int spi_qup_pm_resume_runtime(struct device *device)
return ret; return ret;
ret = clk_prepare_enable(controller->cclk); ret = clk_prepare_enable(controller->cclk);
if (ret) if (ret) {
clk_disable_unprepare(controller->iclk);
return ret; return ret;
}
/* Disable clocks auto gaiting */ /* Disable clocks auto gaiting */
config = readl_relaxed(controller->base + QUP_CONFIG); config = readl_relaxed(controller->base + QUP_CONFIG);