media: staging/imx: fix complete handler

The complete handler walks all entities, expecting to find an imx
subdevice for each and every entity.

However, camera drivers such as smiapp can themselves contain multiple
entities, for which there will not be an imx subdevice.  This causes
imx_media_find_subdev_by_sd() to fail, making the imx capture system
unusable with such cameras.

Work around this by killing the error entirely, thereby allowing
the imx capture to be used with such cameras.

Signed-off-by: Russell King <[email protected]>
Acked-by: Steve Longerbeam <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index 47c4c954fed5b835b19934ac815d106ff24242be..6a773c76cd9e68c74ea7f36e4b98045015c78d86 100644 (file)
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -345,8 +345,11 @@ static int imx_media_add_vdev_to_pad(struct imx_media_dev *imxmd,
 
        sd = media_entity_to_v4l2_subdev(entity);
        imxsd = imx_media_find_subdev_by_sd(imxmd, sd);
-       if (IS_ERR(imxsd))
-               return PTR_ERR(imxsd);
+       if (IS_ERR(imxsd)) {
+               v4l2_err(&imxmd->v4l2_dev, "failed to find subdev for entity %s, sd %p err %ld\n",
+                        entity->name, sd, PTR_ERR(imxsd));
+               return 0;
+       }
 
        imxpad = &imxsd->pad[srcpad->index];
        vdev_idx = imxpad->num_vdevs;