diff options
author | Peter Senna Tschudin <peter.senna@gmail.com> | 2012-09-04 07:05:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-23 12:46:08 -0400 |
commit | 9a888ba273b8bbd82a0b88cfd57c270f6eb8d724 (patch) | |
tree | 05cccee62bf1ec679b35f0df7018d420d7eee74e | |
parent | a84b17e20f51dbc4f5c0aedb00d66f4f7d2ede8d (diff) |
[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>
-rw-r--r-- | drivers/media/platform/davinci/vpfe_capture.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c index 843b138faabe..f99198cebd35 100644 --- a/drivers/media/platform/davinci/vpfe_capture.c +++ b/drivers/media/platform/davinci/vpfe_capture.c | |||
@@ -1131,11 +1131,11 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) | |||
1131 | ret = -EBUSY; | 1131 | ret = -EBUSY; |
1132 | goto unlock_out; | 1132 | goto unlock_out; |
1133 | } | 1133 | } |
1134 | 1134 | ret = vpfe_get_subdev_input_index(vpfe_dev, | |
1135 | if (vpfe_get_subdev_input_index(vpfe_dev, | 1135 | &subdev_index, |
1136 | &subdev_index, | 1136 | &inp_index, |
1137 | &inp_index, | 1137 | index); |
1138 | index) < 0) { | 1138 | if (ret < 0) { |
1139 | v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n"); | 1139 | v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n"); |
1140 | goto unlock_out; | 1140 | goto unlock_out; |
1141 | } | 1141 | } |
@@ -1748,8 +1748,9 @@ static long vpfe_param_handler(struct file *file, void *priv, | |||
1748 | "Error setting parameters in CCDC\n"); | 1748 | "Error setting parameters in CCDC\n"); |
1749 | goto unlock_out; | 1749 | goto unlock_out; |
1750 | } | 1750 | } |
1751 | if (vpfe_get_ccdc_image_format(vpfe_dev, | 1751 | ret = vpfe_get_ccdc_image_format(vpfe_dev, |
1752 | &vpfe_dev->fmt) < 0) { | 1752 | &vpfe_dev->fmt); |
1753 | if (ret < 0) { | ||
1753 | v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, | 1754 | v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, |
1754 | "Invalid image format at CCDC\n"); | 1755 | "Invalid image format at CCDC\n"); |
1755 | goto unlock_out; | 1756 | goto unlock_out; |