Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] omap3isp: Find source pad from external entity 



No longer assume pad number 0 is the source pad of the external entity. Find
the source pad from the external entity and use it instead.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a7b21061

drivers/media/platform/omap3isp/isp.c

+14 −1
Original line number Diff line number Diff line
@@ -1767,6 +1767,7 @@ static int isp_register_entities(struct isp_device *isp) 
		struct media_entity *input;

		unsigned int flags;

		unsigned int pad;

		unsigned int i;



		sensor = isp_register_subdev_group(isp, subdevs->subdevs);

		if (sensor == NULL)
@@ -1814,7 +1815,19 @@ static int isp_register_entities(struct isp_device *isp) 
			goto done;

		}



		ret = media_entity_create_link(&sensor->entity, 0, input, pad,

		for (i = 0; i < sensor->entity.num_pads; i++) {

			if (sensor->entity.pads[i].flags & MEDIA_PAD_FL_SOURCE)

				break;

		}

		if (i == sensor->entity.num_pads) {

			dev_err(isp->dev,

				"%s: no source pad in external entity\n",

				__func__);

			ret = -EINVAL;

			goto done;

		}



		ret = media_entity_create_link(&sensor->entity, i, input, pad,

					       flags);

		if (ret < 0)

			goto done;