Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[deliverable/linux.git] / drivers / pcmcia / vrc4171_card.c

diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 75806be344e59b96b2675892006601c188b1983b..d98a086124922badf7403c583690c7866e6d2271 100644 (file)
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/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;
 }