mtd: rawnand: gpmi: don't leak PM reference in error path
authorChristian Eggers <ceggers@arri.de>
Tue, 25 Jan 2022 08:16:19 +0000 (09:16 +0100)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 26 Jan 2022 09:02:36 +0000 (10:02 +0100)
If gpmi_nfc_apply_timings() fails, the PM runtime usage counter must be
dropped.

Reported-by: Pavel Machek <pavel@denx.de>
Fixes: f53d4c109a66 ("mtd: rawnand: gpmi: Add ERR007117 protection for nfc_apply_timings")
Signed-off-by: Christian Eggers <ceggers@arri.de>
Cc: stable@vger.kernel.org
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220125081619.6286-1-ceggers@arri.de
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

index 1b64c5a..ded4df4 100644 (file)
@@ -2285,7 +2285,7 @@ static int gpmi_nfc_exec_op(struct nand_chip *chip,
                this->hw.must_apply_timings = false;
                ret = gpmi_nfc_apply_timings(this);
                if (ret)
-                       return ret;
+                       goto out_pm;
        }
 
        dev_dbg(this->dev, "%s: %d instructions\n", __func__, op->ninstrs);
@@ -2414,6 +2414,7 @@ unmap:
 
        this->bch = false;
 
+out_pm:
        pm_runtime_mark_last_busy(this->dev);
        pm_runtime_put_autosuspend(this->dev);