Skip to contentSkip to conversation

staging: media: imx: fix inconsistent IS_ERR and PTR_ERR

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Oct 17, 2017

Subsystems (4)
Media (V4L/DVB) Arm i.MX and Layerscape Staging Media drivers for Freescale i.MX
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 staging: media: imx: fix inconsistent IS_ERR and PTR_ERR

Fix inconsistent IS_ERR and PTR_ERR in csi_link_validate. The proper pointer to be passed as argument is sensor.

This issue was detected with the help of Coccinelle.

Reported-by Julia Lawall <[email protected]>
Signed-off-by Gustavo A. R. Silva <[email protected]>

---
This code was tested by compilation only.

 drivers/staging/media/imx/imx-media-csi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/imx/imx-media-csi.c +1 -1
index 6d85611..2fa72c1 100644
@@ -989,7 +989,7 @@ static int csi_link_validate(struct v4l2_subdev *sd,
 	sensor = __imx_media_find_sensor(priv->md, &priv->sd.entity);
 	if (IS_ERR(sensor)) {
 		v4l2_err(&priv->sd, "no sensor attached\n");
-		return PTR_ERR(priv->sensor);
+		return PTR_ERR(sensor);
 	}
 
 	mutex_lock(&priv->lock);
Signature · 1 line
2.7.4
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Gustavo A. R. Silva

Fix inconsistent IS_ERR and PTR_ERR in csi_link_validate. The proper pointer to be passed as argument is sensor.

This issue was detected with the help of Coccinelle.

Reported-by Julia Lawall<[email protected]>
Signed-off-by Gustavo A. R. Silva<[email protected]>

---
This code was tested by compilation only.

  drivers/staging/media/imx/imx-media-csi.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/imx/imx-media-csi.c +0 -0
index 6d85611..2fa72c1 100644

drivers/staging/media/imx/imx-media-csi.c static int csi_link_validate(struct v4l2_subdev *sd, · line 995

Quoted 8 lines
drivers/staging/media/imx/imx-media-csi.c +1 -1
@@ -989,7 +989,7 @@ static int csi_link_validate(struct v4l2_subdev *sd,
  	sensor = __imx_media_find_sensor(priv->md, &priv->sd.entity);
  	if (IS_ERR(sensor)) {
  		v4l2_err(&priv->sd, "no sensor attached\n");
-		return PTR_ERR(priv->sensor);
+		return PTR_ERR(sensor);
  	}
 
  	mutex_lock(&priv->lock);
Reviewed-by Steve Longerbeam <[email protected]>