---

yaml --- r: 295409 b: refs/heads/master c: e2adbec h: refs/heads/master i: 295407: 69b0b52 v: v3
git-mirror · Feb 21, 2012 · 3a30c89 · 3a30c89
1 parent f14d13d
commit 3a30c89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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;
 }