From b1a48462062ac85c2fb9c0e09ce216a928b87a46 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Mon, 24 Sep 2012 06:11:03 -0300 Subject: [PATCH] --- yaml --- r: 333818 b: refs/heads/master c: 58dec65d714f9f2872fdfe8f6a1f36027431de95 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/soc_camera/mx2_camera.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eeac6fe9d7e8..cf14599ed98b 100644 --- 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 index 8d2587137d3b..9fd9d1c5b218 100644 --- 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; }