From: Xiaolei Wang <xiaolei.wang@windriver.com>
To: laurent.pinchart@ideasonboard.com, mchehab@kernel.org,
Frank.li@nxp.com, s.hauer@pengutronix.de, kernel@pengutronix.de,
festevam@gmail.com, aisheng.dong@nxp.com, jacopo@jmondi.org,
guoniu.zhou@nxp.com, s.riedmueller@phytec.de,
Xiaolei.Wang@windriver.com
Cc: linux-media@vger.kernel.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH v2 4/4] media: imx8-isi: clean up already-initialized pipes on probe failure
Date: Wed, 6 May 2026 11:12:10 +0800 [thread overview]
Message-ID: <20260506031210.2769998-5-xiaolei.wang@windriver.com> (raw)
In-Reply-To: <20260506031210.2769998-1-xiaolei.wang@windriver.com>
When mxc_isi_pipe_init() fails partway through the channel loop or
when mxc_isi_v4l2_init() fails, the already initialized pipes are
not cleaned up.
Fix this by calling mxc_isi_pipe_cleanup() for each already-initialized
pipe in the err_xbar error path.
Fixes: cf21f328fcaf ("media: nxp: Add i.MX8 ISI driver")
Signed-off-by: Xiaolei Wang <xiaolei.wang@windriver.com>
---
drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
index 2b76fb9c18f6..8533a979d60a 100644
--- a/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
+++ b/drivers/media/platform/nxp/imx8-isi/imx8-isi-core.c
@@ -539,6 +539,8 @@ static int mxc_isi_probe(struct platform_device *pdev)
return 0;
err_xbar:
+ while (i--)
+ mxc_isi_pipe_cleanup(&isi->pipes[i]);
mxc_isi_crossbar_cleanup(&isi->crossbar);
return ret;
--
2.43.0
next prev parent reply other threads:[~2026-05-06 3:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-06 3:12 [PATCH v2 0/4] media: imx8-isi: fix resource cleanup issues Xiaolei Wang
2026-05-06 3:12 ` [PATCH v2 1/4] media: imx8-isi: fix use-after-free on remove Xiaolei Wang
2026-05-06 12:31 ` Laurent Pinchart
2026-05-06 3:12 ` [PATCH v2 2/4] media: imx8-isi: add missing v4l2_subdev_cleanup() in crossbar and pipe Xiaolei Wang
2026-05-06 12:35 ` Laurent Pinchart
2026-05-06 14:23 ` xiaolei wang
2026-05-06 3:12 ` [PATCH v2 3/4] media: imx8-isi: fix isi->pipes memory leak in probe and remove Xiaolei Wang
2026-05-06 12:41 ` Laurent Pinchart
2026-05-06 14:29 ` xiaolei wang
2026-05-06 3:12 ` Xiaolei Wang [this message]
2026-05-06 14:19 ` [PATCH v2 4/4] media: imx8-isi: clean up already-initialized pipes on probe failure Laurent Pinchart
2026-05-06 14:25 ` Frank Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260506031210.2769998-5-xiaolei.wang@windriver.com \
--to=xiaolei.wang@windriver.com \
--cc=Frank.li@nxp.com \
--cc=aisheng.dong@nxp.com \
--cc=festevam@gmail.com \
--cc=guoniu.zhou@nxp.com \
--cc=imx@lists.linux.dev \
--cc=jacopo@jmondi.org \
--cc=kernel@pengutronix.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=s.riedmueller@phytec.de \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox