* [PATCH] mtd: rawnand: gpmi: don't leak PM reference in error path
@ 2022-01-25 8:16 Christian Eggers
2022-01-26 10:52 ` Miquel Raynal
0 siblings, 1 reply; 2+ messages in thread
From: Christian Eggers @ 2022-01-25 8:16 UTC (permalink / raw)
To: Han Xu, Miquel Raynal
Cc: Richard Weinberger, Vignesh Raghavendra, Stefan Riedmueller,
linux-mtd, linux-kernel, Pavel Machek, Christian Eggers, stable
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
---
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 1b64c5a5140d..ded4df473928 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -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 @@ static int gpmi_nfc_exec_op(struct nand_chip *chip,
this->bch = false;
+out_pm:
pm_runtime_mark_last_busy(this->dev);
pm_runtime_put_autosuspend(this->dev);
--
Christian Eggers
Embedded software developer
Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mtd: rawnand: gpmi: don't leak PM reference in error path
2022-01-25 8:16 [PATCH] mtd: rawnand: gpmi: don't leak PM reference in error path Christian Eggers
@ 2022-01-26 10:52 ` Miquel Raynal
0 siblings, 0 replies; 2+ messages in thread
From: Miquel Raynal @ 2022-01-26 10:52 UTC (permalink / raw)
To: Christian Eggers, Han Xu, Miquel Raynal
Cc: Richard Weinberger, Vignesh Raghavendra, Stefan Riedmueller,
linux-mtd, linux-kernel, Pavel Machek, stable
On Tue, 2022-01-25 at 08:16:19 UTC, Christian Eggers wrote:
> 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
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks.
Miquel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-26 10:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-25 8:16 [PATCH] mtd: rawnand: gpmi: don't leak PM reference in error path Christian Eggers
2022-01-26 10:52 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).