lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 633/700] mtd: rawnand: marvell: add missing clk_disable_unprepare() on error in marvell_nfc_resume()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit ae94c49527aa9bd3b563349adc4b5617747ca6bd ]

    Add clk_disable_unprepare() on error path in marvell_nfc_resume().

    Fixes: bd9c3f9b3c00 ("mtd: rawnand: marvell: add suspend and resume hooks")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20210601125814.3260364-1-yangyingliang@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/nand/raw/marvell_nand.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
    index 79da6b02e209..f83525a1ab0e 100644
    --- a/drivers/mtd/nand/raw/marvell_nand.c
    +++ b/drivers/mtd/nand/raw/marvell_nand.c
    @@ -3030,8 +3030,10 @@ static int __maybe_unused marvell_nfc_resume(struct device *dev)
    return ret;

    ret = clk_prepare_enable(nfc->reg_clk);
    - if (ret < 0)
    + if (ret < 0) {
    + clk_disable_unprepare(nfc->core_clk);
    return ret;
    + }

    /*
    * Reset nfc->selected_chip so the next command will cause the timing
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 10:10    [W:2.598 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site