From a26154b63c58905c1cd8abcfe2ea70a86e2cd19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Va=C5=A1ut?= <marek.vasut@gmail.com>
Date: Wed, 26 May 2010 23:53:09 +0100
Subject: [PATCH] --- yaml --- r: 200287 b: refs/heads/master c:
 3defb2476166445982a90c12d33f8947e75476c4 h: refs/heads/master i:   200285:
 f78f06177ce2f761bf61fe90af4b3ff3f79adc1e   200283:
 5d36ec0e29d3c85d52225bf0de9df103e5675ac4   200279:
 71c7730eaf855d49861d1ecd54c978bcf8636147   200271:
 155ce0ca3749ecbbbc8548950c69038fbd7f9aa2   200255:
 634d2790e6edcaa0763343226691030d341e1090 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/common/sa1111.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 392d6194e16c..f94c6b883cc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba327b1e5296b70745e50bcf0446ae8f82e3d478
+refs/heads/master: 3defb2476166445982a90c12d33f8947e75476c4
diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c
index a52a27c1d9be..6f80665f477e 100644
--- a/trunk/arch/arm/common/sa1111.c
+++ b/trunk/arch/arm/common/sa1111.c
@@ -951,8 +951,6 @@ static int sa1111_resume(struct platform_device *dev)
 	if (!save)
 		return 0;
 
-	spin_lock_irqsave(&sachip->lock, flags);
-
 	/*
 	 * Ensure that the SA1111 is still here.
 	 * FIXME: shouldn't do this here.
@@ -969,6 +967,13 @@ static int sa1111_resume(struct platform_device *dev)
 	 * First of all, wake up the chip.
 	 */
 	sa1111_wake(sachip);
+
+	/*
+	 * Only lock for write ops. Also, sa1111_wake must be called with
+	 * released spinlock!
+	 */
+	spin_lock_irqsave(&sachip->lock, flags);
+
 	sa1111_writel(0, sachip->base + SA1111_INTC + SA1111_INTEN0);
 	sa1111_writel(0, sachip->base + SA1111_INTC + SA1111_INTEN1);