| From 42e7316357bb0ffe92de9e1fc188c20220bda23c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 1 Jun 2021 20:58:14 +0800 |
| Subject: mtd: rawnand: marvell: add missing clk_disable_unprepare() on error |
| in marvell_nfc_resume() |
| |
| 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 f5ca2002d08e..d00c916f133b 100644 |
| --- a/drivers/mtd/nand/raw/marvell_nand.c |
| +++ b/drivers/mtd/nand/raw/marvell_nand.c |
| @@ -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 |
| -- |
| 2.30.2 |
| |
