Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index e469a46a388b79c639b789396d59318fe0890031..ff14fd8f0cd16c65eabfb5ddf2bcb4c3b2a5afe3 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1273,7 +1273,9 @@ static void pcmcia_bus_remove_socket(struct class_device *class_dev,
        pccard_register_pcmcia(socket, NULL);
 
        /* unregister any unbound devices */
+       mutex_lock(&socket->skt_mutex);
        pcmcia_card_remove(socket, NULL);
+       mutex_unlock(&socket->skt_mutex);
 
        pcmcia_put_socket(socket);