lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 277/545] mtd: st_spi_fsm: Add a clk_disable_unprepare() in .probe()s error path
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    [ Upstream commit 28607b426c3d050714f250d0faeb99d2e9106e90 ]

    For all but one error path clk_disable_unprepare() is already there. Add
    it to the one location where it's missing.

    Fixes: 481815a6193b ("mtd: st_spi_fsm: Handle clk_prepare_enable/clk_disable_unprepare.")
    Fixes: 69d5af8d016c ("mtd: st_spi_fsm: Obtain and use EMI clock")
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20220607152458.232847-2-u.kleine-koenig@pengutronix.de
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/devices/st_spi_fsm.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
    index 1888523d9745..9bee99f07af0 100644
    --- a/drivers/mtd/devices/st_spi_fsm.c
    +++ b/drivers/mtd/devices/st_spi_fsm.c
    @@ -2115,10 +2115,12 @@ static int stfsm_probe(struct platform_device *pdev)
    (long long)fsm->mtd.size, (long long)(fsm->mtd.size >> 20),
    fsm->mtd.erasesize, (fsm->mtd.erasesize >> 10));

    - return mtd_device_register(&fsm->mtd, NULL, 0);
    -
    + ret = mtd_device_register(&fsm->mtd, NULL, 0);
    + if (ret) {
    err_clk_unprepare:
    - clk_disable_unprepare(fsm->clk);
    + clk_disable_unprepare(fsm->clk);
    + }
    +
    return ret;
    }

    --
    2.35.1


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