lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 268/862] spi: qup: add missing clk_disable_unprepare on error in spi_qup_pm_resume_runtime()
    Date
    From: Xu Qiang <xuqiang36@huawei.com>

    [ 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>
    ---
    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.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:08    [W:2.764 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site