From fa3eb8bc22b6dcf28c71626d482944f48c685ffa Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 16 Dec 2012 22:00:50 +0100
Subject: [PATCH] --- yaml --- r: 355008 b: refs/heads/master c:
 811af9723859884f2f771f3174f3ddedab7c53b5 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/pcmcia/vrc4171_card.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d73b4c597b67..37b7c58b8cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c286d5a45731d957d02c317ee2ce775e856765
+refs/heads/master: 811af9723859884f2f771f3174f3ddedab7c53b5
diff --git a/trunk/drivers/pcmcia/vrc4171_card.c b/trunk/drivers/pcmcia/vrc4171_card.c
index 75806be344e5..d98a08612492 100644
--- a/trunk/drivers/pcmcia/vrc4171_card.c
+++ b/trunk/drivers/pcmcia/vrc4171_card.c
@@ -246,6 +246,7 @@ static int pccard_init(struct pcmcia_socket *sock)
 	socket = &vrc4171_sockets[slot];
 	socket->csc_irq = search_nonuse_irq();
 	socket->io_irq = search_nonuse_irq();
+	spin_lock_init(&socket->lock);
 
 	return 0;
 }