From bfc35be36ed0cdb8aa0429be1c089824c3bd34d7 Mon Sep 17 00:00:00 2001
From: Javier Martin <javier.martin@vista-silicon.com>
Date: Mon, 13 Feb 2012 10:51:52 -0300
Subject: [PATCH] --- yaml --- r: 295007 b: refs/heads/master c:
 8636ead8b2d738b5b1b9a0c2e6070e3458a47d14 h: refs/heads/master i:   295005:
 6558a49b44257eb33b69eb7c7d918d71e204272f   295003:
 7aa40d5d806bfaa1dbc0dcc641873c7829360234   294999:
 b2ef12ff7497a0b1a750cdd268aa0a7764bbe4b3   294991:
 de6e998954b2716f3085fff483898bf046db222e   294975:
 a53f66c46dd1249358c6a57de16b0270c370e365 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/mx2_camera.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index effc53d41a4e..4a4693e244e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a654ba16fdbad8ffb5a6c0dd5098c6651bde08b5
+refs/heads/master: 8636ead8b2d738b5b1b9a0c2e6070e3458a47d14
diff --git a/trunk/drivers/media/video/mx2_camera.c b/trunk/drivers/media/video/mx2_camera.c
index 2d1941435786..d555b6eccb82 100644
--- a/trunk/drivers/media/video/mx2_camera.c
+++ b/trunk/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;