]> git.baikalelectronics.ru Git - kernel.git/commitdiff
spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime()
authorXu Qiang <xuqiang36@huawei.com>
Thu, 25 Aug 2022 06:53:24 +0000 (06:53 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 11:22:23 +0000 (13:22 +0200)
[ Upstream commit 5d8da7774bf0806d9b14ea7b290ed642348e0085 ]

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

Fixes: f982688ad49c (“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>
drivers/spi/spi-qup.c

index 6da49705a10ab2d8c21e23e6594558016ab0e19f..ead6c211047d5dad418ebdf8c5f668830a2cf9d3 100644 (file)
@@ -1199,8 +1199,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);