[PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code

From: Peter Senna Tschudin
Date: Thu Sep 06 2012 - 11:24:47 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/soc_camera/mx2_camera.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 256187f..f8884a7 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1800,13 +1800,16 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)

if (!res_emma || !irq_emma) {
dev_err(&pdev->dev, "no EMMA resources\n");
+ err = -ENODEV;
goto exit_free_irq;
}

pcdev->res_emma = res_emma;
pcdev->irq_emma = irq_emma;
- if (mx27_camera_emma_init(pcdev))
+ if (mx27_camera_emma_init(pcdev)) {
+ err = -ENODEV;
goto exit_free_irq;
+ }
}

pcdev->soc_host.drv_name = MX2_CAM_DRV_NAME,

--
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/