---

yaml --- r: 41067 b: refs/heads/master c: 8e4d9dc h: refs/heads/master i: 41065: 34f6e21 41063: 5bd8c03 v: v3
git-mirror · Nov 25, 2006 · 379b8e6 · 379b8e6
1 parent 0fcf27e
commit 379b8e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);