Skip to contentSkip to conversation

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

PATCH New Dan Carpenter 1 participant 1 message May 31, 2019

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/staging/media/imx/imx-media-csi.c  | 4 ++--
 drivers/staging/media/imx/imx7-media-csi.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/media/imx/imx-media-csi.c +2 -2
index d2f880938af9..0eeb0db6d83f 100644
@@ -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);
 
drivers/staging/media/imx/imx7-media-csi.c +2 -2
index b1af8694899e..882690561357 100644
@@ -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);
 
Signature · 1 line
2.20.1