From: Biren Pandya <birenpandya@gmail.com>
To: jacopo+renesas@jmondi.org,
kieran.bingham+renesas@ideasonboard.com,
laurent.pinchart+renesas@ideasonboard.com,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
mchehab@kernel.org, sakari.ailus@linux.intel.com,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Biren Pandya <birenpandya@gmail.com>
Subject: [PATCH v4] media: i2c: rdacm21: Fix missing media_entity_cleanup()
Date: Wed, 8 Jul 2026 21:14:21 +0530 [thread overview]
Message-ID: <20260708154420.51617-4-birenpandya@gmail.com> (raw)
In-Reply-To: <20260708154420.51617-3-birenpandya@gmail.com>
If an error occurs after media_entity_pads_init() is called, the media
entity is left uncleaned, potentially leaking resources or leaving it
in an invalid state. Similarly, the remove path misses the cleanup.
Add a dedicated error_entity_cleanup label so that media_entity_cleanup()
is only invoked on the error path when media_entity_pads_init() has
actually succeeded. Also add media_entity_cleanup() to rdacm21_remove()
to ensure proper resource release on driver unload.
Fixes: a59f853b3b4b ("media: i2c: Add driver for RDACM21 camera module")
Signed-off-by: Biren Pandya <birenpandya@gmail.com>
---
Changes in v4:
- Rebased onto latest linux-media next branch to resolve a merge conflict in rdacm21.c (as reported by Media CI).
Changes in v3:
- Added a blank line after media_entity_cleanup() in the error path (Sakari).
Changes in v2:
- Fixed a bug in v1's probe error handling where media_entity_cleanup()
could be called on an uninitialized entity.
- Added Signed-off-by tag which was missing in v1.
---
drivers/media/i2c/rdacm21.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/rdacm21.c b/drivers/media/i2c/rdacm21.c
index bcab462708c70..531b71d0a94df 100644
--- a/drivers/media/i2c/rdacm21.c
+++ b/drivers/media/i2c/rdacm21.c
@@ -588,10 +588,13 @@ static int rdacm21_probe(struct i2c_client *client)
ret = v4l2_async_register_subdev(&dev->sd);
if (ret)
- goto error_free_ctrls;
+ goto error_entity_cleanup;
return 0;
+error_entity_cleanup:
+ media_entity_cleanup(&dev->sd.entity);
+
error_free_ctrls:
v4l2_ctrl_handler_free(&dev->ctrls);
error:
--
2.50.1 (Apple Git-155)
prev parent reply other threads:[~2026-07-08 15:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-04 20:16 [PATCH v2] media: i2c: rdacm21: Fix missing media_entity_cleanup() Biren Pandya
2026-07-08 15:04 ` Sakari Ailus
2026-07-08 15:29 ` [PATCH v3] " Biren Pandya
2026-07-08 15:44 ` Biren Pandya
2026-07-08 15:44 ` Biren Pandya [this message]
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=20260708154420.51617-4-birenpandya@gmail.com \
--to=birenpandya@gmail.com \
--cc=jacopo+renesas@jmondi.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=sakari.ailus@linux.intel.com \
/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