Commit 6d8d61fe authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] smiapp: Initialise media entity after sensor init 



This allows determining the number of pads in the entity based on the
sensor.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent cc1488a1

drivers/media/i2c/smiapp/smiapp-core.c

+5 −5
Original line number Diff line number Diff line
@@ -3058,12 +3058,7 @@ static int smiapp_probe(struct i2c_client *client, 
	sensor->src->sd.internal_ops = &smiapp_internal_src_ops;

	sensor->src->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

	sensor->src->sensor = sensor;



	sensor->src->pads[0].flags = MEDIA_PAD_FL_SOURCE;

	rval = media_entity_pads_init(&sensor->src->sd.entity, 2,

				 sensor->src->pads);

	if (rval < 0)

		return rval;



	if (client->dev.of_node) {

		rval = smiapp_init(sensor);
@@ -3071,6 +3066,11 @@ static int smiapp_probe(struct i2c_client *client, 
			goto out_media_entity_cleanup;

	}



	rval = media_entity_pads_init(&sensor->src->sd.entity, 2,

				 sensor->src->pads);

	if (rval < 0)

		goto out_media_entity_cleanup;



	rval = v4l2_async_register_subdev(&sensor->src->sd);

	if (rval < 0)

		goto out_media_entity_cleanup;