[PATCH v2 1/2] media: i2c: msp3400-driver: Guard media_entity_cleanup() calls

From: Paulo Ravazzano

Date: Tue Nov 17 2026 - 20:44:09 EST


Member entity of struct v4l2_subdev is only defined through
CONFIG_MEDIA_CONTROLLER, so the unconditional
media_entity_cleanup(&sd->entity) added by commit 87d1307b6791 was
breaking the code when CONFIG_MEDIA_CONTROLLER was disable.

Guard the calls with #if define(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@xxxxxxxxx>
---
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