media: staging/imx: fix two NULL vs IS_ERR() bugs

The imx_media_pipeline_pad() function return NULL pointers on error, it
never returns error pointers.

Fixes: 3ef46bc97ca2 ("media: staging/imx: Improve pipeline searching")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c
index d2f880938af9b04edcbf6916d190c9d0af9af27f..0eeb0db6d83f7b673625fd37cd0ab0de05997707 100644 (file)
--- a/drivers/staging/media/imx/imx-media-csi.c
+++ b/drivers/staging/media/imx/imx-media-csi.c
@@ -193,8 +193,8 @@ static int csi_get_upstream_endpoint(struct csi_priv *priv,
 
        /* get source pad of entity directly upstream from src */
        pad = imx_media_pipeline_pad(src, 0, 0, true);
-       if (IS_ERR(pad))
-               return PTR_ERR(pad);
+       if (!pad)
+               return -ENODEV;
 
        sd = media_entity_to_v4l2_subdev(pad->entity);
 

diff --git a/drivers/staging/media/imx/imx7-media-csi.c b/drivers/staging/media/imx/imx7-media-csi.c
index b1af8694899eefb9829099c573d8eb3429359035..8826905613570b84054a55c314c2ef6a1d001e9c 100644 (file)
--- a/drivers/staging/media/imx/imx7-media-csi.c
+++ b/drivers/staging/media/imx/imx7-media-csi.c
@@ -439,8 +439,8 @@ static int imx7_csi_get_upstream_endpoint(struct imx7_csi *csi,
 skip_video_mux:
        /* get source pad of entity directly upstream from src */
        pad = imx_media_pipeline_pad(src, 0, 0, true);
-       if (IS_ERR(pad))
-               return PTR_ERR(pad);
+       if (!pad)
+               return -ENODEV;
 
        sd = media_entity_to_v4l2_subdev(pad->entity);