From: Myeonghun Pak <mhun512@gmail.com>
To: Sakari Ailus <sakari.ailus@linux.intel.com>,
Benjamin Mugnier <benjamin.mugnier@foss.st.com>,
Sylvain Petinot <sylvain.petinot@foss.st.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, Myeonghun Pak <mhun512@gmail.com>
Subject: [PATCH v3] media: i2c: vd56g3: Clean up subdev state on init failure
Date: Mon, 22 Jun 2026 21:14:29 +0900 [thread overview]
Message-ID: <20260622121429.47765-1-mhun512@gmail.com> (raw)
vd56g3_subdev_init() calls v4l2_subdev_init_finalize(), which allocates
the subdev active state and requires v4l2_subdev_cleanup() to release it.
If vd56g3_update_controls() fails after finalize succeeds, the probe error
path currently skips v4l2_subdev_cleanup() and returns an error. The driver
.remove() callback is not called after a failed probe, so the active state
is leaked.
Move the control update to vd56g3_probe() after vd56g3_subdev_init()
succeeds, and route failures through the existing err_subdev path. This
keeps v4l2_subdev_cleanup() in the common vd56g3_subdev_cleanup() helper.
Fixes: 87aa97fc3157 ("media: i2c: Add driver for ST VD56G3 camera sensor")
Cc: stable@vger.kernel.org
Assisted-by: OpenAI:GPT-5.4
Signed-off-by: Myeonghun Pak <mhun512@gmail.com>
---
Changes in v3:
- Restore the capitalized subject summary.
- Route vd56g3_update_controls() failures through the probe-side subdev
cleanup path instead of adding a second v4l2_subdev_cleanup() call.
- Add the Assisted-by trailer.
Changes in v2:
- Use a lowercase subject summary.
drivers/media/i2c/vd56g3.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/media/i2c/vd56g3.c b/drivers/media/i2c/vd56g3.c
index 157acea9e2..39fb14bab5 100644
--- a/drivers/media/i2c/vd56g3.c
+++ b/drivers/media/i2c/vd56g3.c
@@ -1388,7 +1388,6 @@ static int vd56g3_detect(struct vd56g3 *sensor)
static int vd56g3_subdev_init(struct vd56g3 *sensor)
{
- struct v4l2_subdev_state *state;
int ret;
/* Init remaining sub device ops */
@@ -1421,15 +1420,6 @@ static int vd56g3_subdev_init(struct vd56g3 *sensor)
goto err_ctrls;
}
- /* Update controls according to the resolution set */
- state = v4l2_subdev_lock_and_get_active_state(&sensor->sd);
- ret = vd56g3_update_controls(sensor);
- v4l2_subdev_unlock_state(state);
- if (ret) {
- dev_err(sensor->dev, "Controls update failed: %d\n", ret);
- goto err_ctrls;
- }
-
return 0;
err_ctrls:
@@ -1452,6 +1442,7 @@ static void vd56g3_subdev_cleanup(struct vd56g3 *sensor)
static int vd56g3_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
+ struct v4l2_subdev_state *state;
struct vd56g3 *sensor;
int ret;
@@ -1517,6 +1508,15 @@ static int vd56g3_probe(struct i2c_client *client)
goto err_power_off;
}
+ /* Update controls according to the resolution set */
+ state = v4l2_subdev_lock_and_get_active_state(&sensor->sd);
+ ret = vd56g3_update_controls(sensor);
+ v4l2_subdev_unlock_state(state);
+ if (ret) {
+ dev_err(sensor->dev, "Controls update failed: %d\n", ret);
+ goto err_subdev;
+ }
+
ret = v4l2_async_register_subdev(&sensor->sd);
if (ret) {
dev_err(dev, "Async subdev register failed: %d\n", ret);
--
2.50.1
reply other threads:[~2026-06-22 12:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260622121429.47765-1-mhun512@gmail.com \
--to=mhun512@gmail.com \
--cc=benjamin.mugnier@foss.st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=sylvain.petinot@foss.st.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