From 3a30c89fc1c0a840047050c4a76fbd3762fb3ac4 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 16 Jan 2012 09:28:49 +0000
Subject: [PATCH] --- yaml --- r: 295409 b: refs/heads/master c:
 e2adbecfcb08ae68e05d9a076b5d398cee939664 h: refs/heads/master i:   295407:
 69b0b52dc3270b0cba111a8f5633ebdd9258fcb9 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/pcmcia/sa1100_jornada720.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2071d4fd3e0d..59ee75388cc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65c77dcaa4d175194588cc829ccf0f1709f257c5
+refs/heads/master: e2adbecfcb08ae68e05d9a076b5d398cee939664
diff --git a/trunk/drivers/pcmcia/sa1100_jornada720.c b/trunk/drivers/pcmcia/sa1100_jornada720.c
index 61b443e8e074..69428d1f5ae1 100644
--- a/trunk/drivers/pcmcia/sa1100_jornada720.c
+++ b/trunk/drivers/pcmcia/sa1100_jornada720.c
@@ -78,13 +78,8 @@ jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
 	}
 
 	ret = sa1111_pcmcia_configure_socket(skt, state);
-	if (ret == 0) {
-		unsigned long flags;
-
-		local_irq_save(flags);
+	if (ret == 0)
 		sa1111_set_io(s->dev, pa_dwr_mask, pa_dwr_set);
-		local_irq_restore(flags);
-	}
 
 	return ret;
 }