lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 081/717] spi: bcm63xx-hsspi: fix missing clk_disable_unprepare() on error in bcm63xx_hsspi_resume
    Date
    From: Qinglang Miao <miaoqinglang@huawei.com>

    [ Upstream commit 9bb9ef2b3e5d9d012876e7e2d7757eb30e865bee ]

    Fix the missing clk_disable_unprepare() before return
    from bcm63xx_hsspi_resume in the error handling case when
    fails to prepare and enable bs->pll_clk.

    Fixes: 0fd85869c2a9 ("spi/bcm63xx-hsspi: keep pll clk enabled")
    Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
    Link: https://lore.kernel.org/r/20201103074911.195530-1-miaoqinglang@huawei.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-bcm63xx-hsspi.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
    index 9909b18f3c5a5..1f08d7553f079 100644
    --- a/drivers/spi/spi-bcm63xx-hsspi.c
    +++ b/drivers/spi/spi-bcm63xx-hsspi.c
    @@ -494,8 +494,10 @@ static int bcm63xx_hsspi_resume(struct device *dev)

    if (bs->pll_clk) {
    ret = clk_prepare_enable(bs->pll_clk);
    - if (ret)
    + if (ret) {
    + clk_disable_unprepare(bs->clk);
    return ret;
    + }
    }

    spi_master_resume(master);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 16:17    [W:3.459 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site