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 267/862] spi: qup: add missing clk_disable_unprepare on error in spi_qup_resume()
    Date
    From: Xu Qiang <xuqiang36@huawei.com>

    [ Upstream commit 70034320fdc597b8f58b4a43bb547f17c4c5557a ]

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

    Fixes: 64ff247a978f (“spi: Add Qualcomm QUP SPI controller support”)
    Signed-off-by: Xu Qiang <xuqiang36@huawei.com>
    Link: https://lore.kernel.org/r/20220825065324.68446-1-xuqiang36@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-qup.c | 17 ++++++++++++++---
    1 file changed, 14 insertions(+), 3 deletions(-)

    diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
    index 00d6084306b4..ae4e67f152ec 100644
    --- a/drivers/spi/spi-qup.c
    +++ b/drivers/spi/spi-qup.c
    @@ -1245,14 +1245,25 @@ static int spi_qup_resume(struct device *device)
    return ret;

    ret = clk_prepare_enable(controller->cclk);
    - if (ret)
    + if (ret) {
    + clk_disable_unprepare(controller->iclk);
    return ret;
    + }

    ret = spi_qup_set_state(controller, QUP_STATE_RESET);
    if (ret)
    - return ret;
    + goto disable_clk;
    +
    + ret = spi_master_resume(master);
    + if (ret)
    + goto disable_clk;

    - return spi_master_resume(master);
    + return 0;
    +
    +disable_clk:
    + clk_disable_unprepare(controller->cclk);
    + clk_disable_unprepare(controller->iclk);
    + return ret;
    }
    #endif /* CONFIG_PM_SLEEP */

    --
    2.35.1


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