From: Peter Senna Tschudin <peter.se...@gmail.com>

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.se...@gmail.com>

---
 drivers/media/platform/davinci/vpfe_capture.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/davinci/vpfe_capture.c 
b/drivers/media/platform/davinci/vpfe_capture.c
index 843b138..f99198c 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)
                ret = -EBUSY;
                goto unlock_out;
        }
-
-       if (vpfe_get_subdev_input_index(vpfe_dev,
-                                       &subdev_index,
-                                       &inp_index,
-                                       index) < 0) {
+       ret = vpfe_get_subdev_input_index(vpfe_dev,
+                                         &subdev_index,
+                                         &inp_index,
+                                         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;

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to