---

yaml --- r: 333818 b: refs/heads/master c: 58dec65 h: refs/heads/master v: v3
git-mirror · Oct 6, 2012 · b1a4846 · b1a4846
1 parent 7ef68ca
commit b1a4846
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02249369352879343337ee63b45dee1e1cfc2550
+refs/heads/master: 58dec65d714f9f2872fdfe8f6a1f36027431de95
diff --git a/trunk/drivers/media/platform/soc_camera/mx2_camera.c b/trunk/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;
 	}