media: i2c: msp3400-driver: Guard media_entity_cleanup() calls
PATCH v2 1/2 media: i2c: msp3400-driver: Guard media_entity_cleanup() calls
Member entity of struct v4l2_subdev is only defined through
CONFIG_MEDIA_CONTROLLER, so the unconditionalmedia_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.
--- drivers/media/i2c/msp3400-driver.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/media/i2c/msp3400-driver.c +6 -0
@@ -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 }/* ----------------------------------------------------------------------- */
Signature · 1 line
2.56.1
PATCH v2 2/2 media: i2c: saa7115: Guard media_entity_cleanup() calls
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 6787d5189e32 break the build when CONFIG_MEDIA_CONTROLLER is disabled.
Guard both calls with #if defined(CONFIG_MEDIA_CONTROLLER).
An AI agent was used to find the bug. The correction was done manually.
--- drivers/media/i2c/saa7115.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/saa7115.c +4 -0
@@ -1868,7 +1868,9 @@ static int saa711x_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; }v4l2_ctrl_auto_cluster (2 , &state->agc,0 , true);
@@ -1927,7 +1929,9 @@ static void saa711x_remove(struct i2c_client *client)v4l2_device_unregister_subdev (sd);v4l2_ctrl_handler_free (sd->ctrl_handler); +#if defined(CONFIG_MEDIA_CONTROLLER )media_entity_cleanup (&sd->entity); +#endif }static const struct i2c_device_id saa711x_id[] = {
Signature · 1 line
2.56.1