From 665ad8af8f93ed9b54e99f37e24def6f623698c6 Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Mon, 13 Feb 2012 10:51:53 -0300 Subject: [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 Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/mx2_camera.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'drivers/media') 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); -- cgit v1.2.3