Commit 1488c3cf authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Mauro Carvalho Chehab
Browse files

media: staging/imx: Loop through all registered subdevs for media links



The root imx-media notifier no longer sees all bound subdevices because
some of them will be bound to subdev notifiers. So imx_media_create_links()
now needs to loop through all subdevices registered with the v4l2-device,
not just the ones in the root notifier's done list. This should be safe
because imx_media_create_of_links() checks if a fwnode link already
exists before creating.

Signed-off-by: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 21711787
Loading
Loading
Loading
Loading
+6 −10
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ out:
}

/*
 * create the media links for all subdevs that registered async.
 * Create the media links for all subdevs that registered.
 * Called after all async subdevs have bound.
 */
static int imx_media_create_links(struct v4l2_async_notifier *notifier)
@@ -184,14 +184,7 @@ static int imx_media_create_links(struct v4l2_async_notifier *notifier)
	struct v4l2_subdev *sd;
	int ret;

	/*
	 * Only links are created between subdevices that are known
	 * to the async notifier. If there are other non-async subdevices,
	 * they were created internally by some subdevice (smiapp is one
	 * example). In those cases it is expected the subdevice is
	 * responsible for creating those internal links.
	 */
	list_for_each_entry(sd, &notifier->done, async_list) {
	list_for_each_entry(sd, &imxmd->v4l2_dev.subdevs, list) {
		switch (sd->grp_id) {
		case IMX_MEDIA_GRP_ID_VDIC:
		case IMX_MEDIA_GRP_ID_IC_PRP:
@@ -211,7 +204,10 @@ static int imx_media_create_links(struct v4l2_async_notifier *notifier)
				imx_media_create_csi_of_links(imxmd, sd);
			break;
		default:
			/* this is an external fwnode subdev */
			/*
			 * if this subdev has fwnode links, create media
			 * links for them.
			 */
			imx_media_create_of_links(imxmd, sd);
			break;
		}