Skip to content

Commit

Permalink
spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_re…
Browse files Browse the repository at this point in the history
…sume_runtime()

[ Upstream commit 494a227 ]

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

Fixes: dae1a77 (“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>
  • Loading branch information
Xu Qiang authored and gregkh committed Oct 21, 2022
1 parent 0a11819 commit 7751390
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/spi/spi-qup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 7751390

Please sign in to comment.