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

Commit 5e7f9e90 authored by Steve Longerbeam's avatar Steve Longerbeam Committed by Greg Kroah-Hartman
Browse files

media: imx: Clear fwnode link struct for each endpoint iteration 



commit 107927fa597c99eaeee4f51865ca0956ec71b6a2 upstream.

In imx_media_create_csi_of_links(), the 'struct v4l2_fwnode_link' must
be cleared for each endpoint iteration, otherwise if the remote port
has no "reg" property, link.remote_port will not be reset to zero.
This was discovered on the i.MX53 SMD board, since the OV5642 connects
directly to ipu1_csi0 and has a single source port with no "reg"
property.

Fixes: 621b08ea ("media: staging/imx: remove static media link arrays")

Signed-off-by: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef12f5b5

drivers/staging/media/imx/imx-media-of.c

+9 −6
Original line number Diff line number Diff line
@@ -233,15 +233,18 @@ int imx_media_create_csi_of_links(struct imx_media_dev *imxmd, 
				  struct v4l2_subdev *csi)

{

	struct device_node *csi_np = csi->dev->of_node;

	struct device_node *ep;



	for_each_child_of_node(csi_np, ep) {

		struct fwnode_handle *fwnode, *csi_ep;

		struct v4l2_fwnode_link link;

	struct device_node *ep;

		int ret;



		memset(&link, 0, sizeof(link));



		link.local_node = of_fwnode_handle(csi_np);

		link.local_port = CSI_SINK_PAD;



	for_each_child_of_node(csi_np, ep) {

		csi_ep = of_fwnode_handle(ep);



		fwnode = fwnode_graph_get_remote_endpoint(csi_ep);