From: Javier Martin <javier.martin@vista-silicon.com>
Date: Mon, 13 Feb 2012 13:51:53 +0000 (-0300)
Subject: [media] media: i.MX27 camera: return IRQ_NONE if no IRQ status bit is set
X-Git-Tag: MMI-PSA29.97-13-9~14196^2~2674
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=665ad8af8f93ed9b54e99f37e24def6f623698c6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[media] media: i.MX27 camera: return IRQ_NONE if no IRQ status bit is set

If active_bufs() list is empty and no IRQ status bit is set
we are probably dealing with a share IRQ. Return IRQ_NONE in
this case.

Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index d555b6eccb82..1a8e4676c8a7 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -1292,7 +1292,11 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data)
 	if (list_empty(&pcdev->active_bufs)) {
 		dev_warn(pcdev->dev, "%s: called while active list is empty\n",
 			__func__);
-		goto irq_ok;
+
+		if (!status) {
+			spin_unlock(&pcdev->lock);
+			return IRQ_NONE;
+		}
 	}
 
 	if (status & (1 << 7)) { /* overflow */
@@ -1323,7 +1327,6 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data)
 		mx27_camera_frame_done_emma(pcdev, 1, false);
 	}
 
-irq_ok:
 	spin_unlock(&pcdev->lock);
 	writel(status, pcdev->base_emma + PRP_INTRSTATUS);