From 379b8e66e4a6c79f72e66b3777b56c8be37ba3c3 Mon Sep 17 00:00:00 2001 From: Daniel Ritz Date: Sat, 25 Nov 2006 11:09:17 -0800 Subject: [PATCH] --- yaml --- r: 41067 b: refs/heads/master c: 8e4d9dcb4205dd43c4297168022ed0c6874fb918 h: refs/heads/master i: 41065: 34f6e21678a8e1a7f0c535cb9172394715a1b74a 41063: 5bd8c03f386bdb1b75abdd3159b176a2b6194873 v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/ds.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2f6522c197dd..8adf5d77dccb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1abbfb412b1610ec3a7ec0164108cee01191d9f5 +refs/heads/master: 8e4d9dcb4205dd43c4297168022ed0c6874fb918 diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c index a20d84d707d9..21d83a895b21 100644 --- a/trunk/drivers/pcmcia/ds.c +++ b/trunk/drivers/pcmcia/ds.c @@ -1272,7 +1272,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);