From: Paulo Ravazzano <paulo.ravazzano@gmail.com>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Biren Pandya <birenpandya@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Paulo Ravazzano <paulo.ravazzano@gmail.com>
Subject: [PATCH v3 1/2] media: i2c: msp3400-driver: Guard media_entity_cleanup() calls
Date: Wed, 18 Nov 2026 08:48:34 -0300 [thread overview]
Message-ID: <20261118114835.42431-1-paulo.ravazzano@gmail.com> (raw)
The entity member of struct v4l2_subdev is only defined when
CONFIG_MEDIA_CONTROLLER is enabled, so the unconditional
media_entity_cleanup(&sd->entity) calls added by commit 87d1307b6791
("media: i2c: msp3400-driver: Add missing media_entity_cleanup()")
break the build when CONFIG_MEDIA_CONTROLLER is disabled.
Guard the calls with #if defined(CONFIG_MEDIA_CONTROLLER).
An AI agent was used to find the bug. The correction was done manually.
Fixes: 87d1307b6791 ("media: i2c: msp3400-driver: Add missing media_entity_cleanup()")
Signed-off-by: Paulo Ravazzano <paulo.ravazzano@gmail.com>
---
drivers/media/i2c/msp3400-driver.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/i2c/msp3400-driver.c b/drivers/media/i2c/msp3400-driver.c
index 8c2edd462..8f0b385fa 100644
--- a/drivers/media/i2c/msp3400-driver.c
+++ b/drivers/media/i2c/msp3400-driver.c
@@ -717,7 +717,9 @@ static int msp_probe(struct i2c_client *client)
if (state->rev1 == -1 || (state->rev1 == 0 && state->rev2 == 0)) {
dev_dbg_lvl(&client->dev, 1, msp_debug,
"not an msp3400 (cannot read chip version)\n");
+#if defined(CONFIG_MEDIA_CONTROLLER)
media_entity_cleanup(&sd->entity);
+#endif
return -ENODEV;
}
@@ -813,7 +815,9 @@ static int msp_probe(struct i2c_client *client)
int err = hdl->error;
v4l2_ctrl_handler_free(hdl);
+#if defined(CONFIG_MEDIA_CONTROLLER)
media_entity_cleanup(&sd->entity);
+#endif
return err;
}
@@ -867,7 +871,9 @@ static void msp_remove(struct i2c_client *client)
msp_reset(client);
v4l2_ctrl_handler_free(&state->hdl);
+#if defined(CONFIG_MEDIA_CONTROLLER)
media_entity_cleanup(&state->sd.entity);
+#endif
}
/* ----------------------------------------------------------------------- */
--
2.56.1
next reply other threads:[~2026-11-18 11:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 11:48 Paulo Ravazzano [this message]
2026-11-18 11:48 ` [PATCH v3 2/2] media: i2c: saa7115: " Paulo Ravazzano
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=20261118114835.42431-1-paulo.ravazzano@gmail.com \
--to=paulo.ravazzano@gmail.com \
--cc=birenpandya@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--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
all inboxes | Powered by JetHome®