diff options
| author | Javier Martin <javier.martin@vista-silicon.com> | 2012-02-13 14:51:52 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-08 13:44:00 +0100 |
| commit | 8636ead8b2d738b5b1b9a0c2e6070e3458a47d14 (patch) | |
| tree | 69e987b902a66911c89739e242efd86417ddfe71 /drivers/media/video | |
| parent | [media] media: i.MX27 camera: Use list_first_entry() whenever possible (diff) | |
| download | linux-8636ead8b2d738b5b1b9a0c2e6070e3458a47d14.tar.xz linux-8636ead8b2d738b5b1b9a0c2e6070e3458a47d14.zip | |
[media] media: i.MX27 camera: Use spin_lock() inside the IRQ handler
We don't need to use spin_lock_irqsave() since there are not
any other IRQs that can race with this ISR.
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/video')
| -rw-r--r-- | drivers/media/video/mx2_camera.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c index 2d1941435786..d555b6eccb82 100644 --- a/drivers/media/video/mx2_camera.c +++ b/drivers/media/video/mx2_camera.c @@ -1286,9 +1286,8 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data) struct mx2_camera_dev *pcdev = data; unsigned int status = readl(pcdev->base_emma + PRP_INTRSTATUS); struct mx2_buffer *buf; - unsigned long flags; - spin_lock_irqsave(&pcdev->lock, flags); + spin_lock(&pcdev->lock); if (list_empty(&pcdev->active_bufs)) { dev_warn(pcdev->dev, "%s: called while active list is empty\n", @@ -1325,7 +1324,7 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data) } irq_ok: - spin_unlock_irqrestore(&pcdev->lock, flags); + spin_unlock(&pcdev->lock); writel(status, pcdev->base_emma + PRP_INTRSTATUS); return IRQ_HANDLED; |