]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mtd: rawnand: gpmi: Fix runtime PM imbalance on error
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Fri, 22 May 2020 09:51:39 +0000 (17:51 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:18:07 +0000 (13:18 +0200)
[ Upstream commit 550e68ea36a6671a96576c0531685ce6e6c0d19d ]

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200522095139.19653-1-dinghao.liu@zju.edu.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

index b9d5d55a5edb9a6e5384a87a1470f168225db58a..ef89947ee3191fbed80ec9bd6c90a542504024f4 100644 (file)
@@ -540,8 +540,10 @@ static int bch_set_geometry(struct gpmi_nand_data *this)
                return ret;
 
        ret = pm_runtime_get_sync(this->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_autosuspend(this->dev);
                return ret;
+       }
 
        /*
        * Due to erratum #2847 of the MX23, the BCH cannot be soft reset on this