hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: Prabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Peter Senna Tschudin 2012-09-04 08:05:03 -03:00 committed by Mauro Carvalho Chehab
parent a84b17e20f
commit 9a888ba273
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/platform/davinci/vpfe_capture.c
View File

@ -1131,11 +1131,11 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index)
ret = -EBUSY; ret = -EBUSY;
goto unlock_out; goto unlock_out;
} }
ret = vpfe_get_subdev_input_index(vpfe_dev,
if (vpfe_get_subdev_input_index(vpfe_dev, &subdev_index,
&subdev_index, &inp_index,
&inp_index, index);
index) < 0) { if (ret < 0) {
v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n"); v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n");
goto unlock_out; goto unlock_out;
} }
@ -1748,8 +1748,9 @@ static long vpfe_param_handler(struct file *file, void *priv,
"Error setting parameters in CCDC\n"); "Error setting parameters in CCDC\n");
goto unlock_out; goto unlock_out;
} }
if (vpfe_get_ccdc_image_format(vpfe_dev, ret = vpfe_get_ccdc_image_format(vpfe_dev,
&vpfe_dev->fmt) < 0) { &vpfe_dev->fmt);
if (ret < 0) {
v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev,
"Invalid image format at CCDC\n"); "Invalid image format at CCDC\n");
goto unlock_out; goto unlock_out;