aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare2012-12-16 15:00:50 -0600
committerGreg Kroah-Hartman2013-02-28 08:32:27 -0600
commit9c3f628b6004454a3867b4c0dad9c9738405dd75 (patch)
tree02d6d0069ecd23e0ac75e3e40fab0467dfdf435d
parentef96576ef50b8bbd4c63b9cebab372cb7cf4ba67 (diff)
downloadkernel-common-9c3f628b6004454a3867b4c0dad9c9738405dd75.tar.gz
kernel-common-9c3f628b6004454a3867b4c0dad9c9738405dd75.tar.xz
kernel-common-9c3f628b6004454a3867b4c0dad9c9738405dd75.zip
pcmcia/vrc4171: Add missing spinlock init
commit 811af9723859884f2f771f3174f3ddedab7c53b5 upstream. It doesn't seem this spinlock was properly initialized. This bug was introduced by commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/pcmcia/vrc4171_card.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 86e4a1a3c64..6bb02ab5dd9 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -246,6 +246,7 @@ static int pccard_init(struct pcmcia_socket *sock)
246 socket = &vrc4171_sockets[slot]; 246 socket = &vrc4171_sockets[slot];
247 socket->csc_irq = search_nonuse_irq(); 247 socket->csc_irq = search_nonuse_irq();
248 socket->io_irq = search_nonuse_irq(); 248 socket->io_irq = search_nonuse_irq();
249 spin_lock_init(&socket->lock);
249 250
250 return 0; 251 return 0;
251} 252}