OSDN Git Service

media: imx: Clear fwnode link struct for each endpoint iteration
authorSteve Longerbeam <slongerbeam@gmail.com>
Wed, 20 Feb 2019 23:53:30 +0000 (18:53 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Tue, 19 Mar 2019 17:40:29 +0000 (13:40 -0400)
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: 621b08eabcddb ("media: staging/imx: remove static media link arrays")

Signed-off-by: Steve Longerbeam <slongerbeam@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/staging/media/imx/imx-media-of.c

index 0344633..a26bdeb 100644 (file)
@@ -145,15 +145,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 fwnode_handle *fwnode, *csi_ep;
-       struct v4l2_fwnode_link link;
        struct device_node *ep;
-       int ret;
-
-       link.local_node = of_fwnode_handle(csi_np);
-       link.local_port = CSI_SINK_PAD;
 
        for_each_child_of_node(csi_np, ep) {
+               struct fwnode_handle *fwnode, *csi_ep;
+               struct v4l2_fwnode_link link;
+               int ret;
+
+               memset(&link, 0, sizeof(link));
+
+               link.local_node = of_fwnode_handle(csi_np);
+               link.local_port = CSI_SINK_PAD;
+
                csi_ep = of_fwnode_handle(ep);
 
                fwnode = fwnode_graph_get_remote_endpoint(csi_ep);