[PATCH 5/5] drivers/media/platform/omap3isp/isp.c: fix error return code

From: Peter Senna Tschudin
Date: Tue Sep 04 2012 - 12:15:36 EST


From: Peter Senna Tschudin <peter.senna@xxxxxxxxx>

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@xxxxxxxxx>

---
drivers/media/platform/omap3isp/isp.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index e0096e0..91fcaef 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct platform_device *pdev)
if (ret < 0)
goto error;

- if (__omap3isp_get(isp, false) == NULL)
+ if (__omap3isp_get(isp, false) == NULL) {
+ ret = -EBUSY; /* Not sure if EBUSY is best for here */
goto error;
+ }

ret = isp_reset(isp);
if (ret < 0)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/