From 2003abeaf30a299c6fa96331644ee351abdbc548 Mon Sep 17 00:00:00 2001
From: Daniel Ritz <daniel.ritz-ml@swissonline.ch>
Date: Sat, 18 Nov 2006 22:19:34 -0800
Subject: [PATCH] --- yaml --- r: 41012 b: refs/heads/master c:
 dfbc9e9d33adb1ac9910dd7f8ceb911947039a52 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/ds.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 31d0c351f3b6..a6662956b1d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 610a5b742e9df4e59047f22d13d8bd83cafce388
+refs/heads/master: dfbc9e9d33adb1ac9910dd7f8ceb911947039a52
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
index 0f701921c13e..a20d84d707d9 100644
--- a/trunk/drivers/pcmcia/ds.c
+++ b/trunk/drivers/pcmcia/ds.c
@@ -1271,6 +1271,9 @@ static void pcmcia_bus_remove_socket(struct class_device *class_dev,
 	socket->pcmcia_state.dead = 1;
 	pccard_register_pcmcia(socket, NULL);
 
+	/* unregister any unbound devices */
+	pcmcia_card_remove(socket, NULL);
+
 	pcmcia_put_socket(socket);
 
 	return;