]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
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)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 13 Aug 2021 07:31:30 +0000 (09:31 +0200)
BugLink: https://bugs.launchpad.net/bugs/1938340
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/mtd/nand/raw/marvell_nand.c

index 42d4881d598df5f040c1d7ede810272c7cf70285..c3289f6c90d40db78a50d522c58de8ebfdb7e2ea 100644 (file)
@@ -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