diff options
| author | Yang Yingliang <yangyingliang@huawei.com> | 2021-06-01 20:58:14 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-14 16:56:47 +0200 |
| commit | c183b55ed7e5f59b2c509b7bc5b853e7c3b9e9e4 (patch) | |
| tree | 98772aa26bdd6245dff954f6479480c2466def86 /drivers | |
| parent | f929d21af75d96b2417b266012cc94f7201cb5d3 (diff) | |
| download | linux-c183b55ed7e5f59b2c509b7bc5b853e7c3b9e9e4.tar.gz linux-c183b55ed7e5f59b2c509b7bc5b853e7c3b9e9e4.tar.bz2 linux-c183b55ed7e5f59b2c509b7bc5b853e7c3b9e9e4.zip | |
mtd: rawnand: marvell: add missing clk_disable_unprepare() on error in marvell_nfc_resume()
[ 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/raw/marvell_nand.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |
