mtd: rawnand: marvell: add missing clk_disable_unprepare() on error in marvell_nfc_re...
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 1 Jun 2021 12:58:14 +0000 (20:58 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:56:47 +0000 (16:56 +0200)
[ 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

index f5ca200..d00c916 100644 (file)
@@ -3036,8 +3036,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