aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2012-09-24 06:11:03 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-06 09:18:10 -0300
commit58dec65d714f9f2872fdfe8f6a1f36027431de95 (patch)
tree0a5268b6d7bfb78d17941c934b3c620d3d6cd077 /drivers/media
parent[media] soc_camera: Use devm_kzalloc function (diff)
downloadlinux-dev-58dec65d714f9f2872fdfe8f6a1f36027431de95.tar.xz
linux-dev-58dec65d714f9f2872fdfe8f6a1f36027431de95.zip
[media] drivers/media/platform/soc_camera/mx2_camera.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> [mchehab@redhat.com: Second hunk removed, as it doesn't apply anymore, due to a merge conflict] Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/soc_camera/mx2_camera.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 8d2587137d3b..9fd9d1c5b218 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1655,6 +1655,7 @@ static int __devinit mx27_camera_emma_init(struct platform_device *pdev)
irq_emma = platform_get_irq(pdev, 1);
if (!res_emma || !irq_emma) {
dev_err(pcdev->dev, "no EMMA resources\n");
+ err = -ENODEV;
goto out;
}