diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-02-13 10:51:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-08 09:45:06 -0300 |
| commit | 665ad8af8f93ed9b54e99f37e24def6f623698c6 (patch) | |
| tree | 975c10084299a302ed1888e221353273a1bf435a /drivers/media | |
| parent | 8636ead8b2d738b5b1b9a0c2e6070e3458a47d14 (diff) | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/mx2_camera.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); |