Commit 9a888ba2 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab
Browse files

[media] drivers/media/platform/davinci/vpfe_capture.c: fix error return code 

Convert a nonnegative error return code to a negative one, as returned
elsewhere in the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)
// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Cc: Prabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a84b17e2

drivers/media/platform/davinci/vpfe_capture.c

+8 −7
Original line number Diff line number Diff line
@@ -1131,11 +1131,11 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) 
		ret = -EBUSY;

		goto unlock_out;

	}



	if (vpfe_get_subdev_input_index(vpfe_dev,

	ret = vpfe_get_subdev_input_index(vpfe_dev,

					  &subdev_index,

					  &inp_index,

					index) < 0) {

					  index);

	if (ret < 0) {

		v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n");

		goto unlock_out;

	}
@@ -1748,8 +1748,9 @@ static long vpfe_param_handler(struct file *file, void *priv, 
					"Error setting parameters in CCDC\n");

				goto unlock_out;

			}

			if (vpfe_get_ccdc_image_format(vpfe_dev,

						       &vpfe_dev->fmt) < 0) {

			ret = vpfe_get_ccdc_image_format(vpfe_dev,

							 &vpfe_dev->fmt);

			if (ret < 0) {

				v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,

					"Invalid image format at CCDC\n");

				goto unlock_out;