Commit ca0fa5f0 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: adv7180/tvp514x/tvp7002: fix entity function 



The entity function was ORed with the flags field instead of
assigned to the function field. Correct this.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent a20a82b8

drivers/media/i2c/adv7180.c

+1 −1
Original line number Diff line number Diff line
@@ -1335,7 +1335,7 @@ static int adv7180_probe(struct i2c_client *client, 
		goto err_unregister_vpp_client;



	state->pad.flags = MEDIA_PAD_FL_SOURCE;

	sd->entity.flags |= MEDIA_ENT_F_ATV_DECODER;

	sd->entity.function = MEDIA_ENT_F_ATV_DECODER;

	ret = media_entity_pads_init(&sd->entity, 1, &state->pad);

	if (ret)

		goto err_free_ctrl;

drivers/media/i2c/tvp514x.c

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) 
#if defined(CONFIG_MEDIA_CONTROLLER)

	decoder->pad.flags = MEDIA_PAD_FL_SOURCE;

	decoder->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	decoder->sd.entity.flags |= MEDIA_ENT_F_ATV_DECODER;

	decoder->sd.entity.function = MEDIA_ENT_F_ATV_DECODER;



	ret = media_entity_pads_init(&decoder->sd.entity, 1, &decoder->pad);

	if (ret < 0) {

drivers/media/i2c/tvp7002.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id) 
#if defined(CONFIG_MEDIA_CONTROLLER)

	device->pad.flags = MEDIA_PAD_FL_SOURCE;

	device->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	device->sd.entity.flags |= MEDIA_ENT_F_ATV_DECODER;

	device->sd.entity.function = MEDIA_ENT_F_ATV_DECODER;



	error = media_entity_pads_init(&device->sd.entity, 1, &device->pad);

	if (error < 0)