From 0ffe85870a05452b1f0a489319dac04fb866070c Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 17 Aug 2012 10:49:04 -0600
Subject: [PATCH] --- yaml --- r: 324206 b: refs/heads/master c:
 0a140577316268b3263fd169d339188ad1636af3 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/pcmcia/cardbus.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4ef50b01f98b..130f0d590276 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e548431a7a2e73121c4a452eb3d1b0659bd77f
+refs/heads/master: 0a140577316268b3263fd169d339188ad1636af3
diff --git a/trunk/drivers/pcmcia/cardbus.c b/trunk/drivers/pcmcia/cardbus.c
index 24caeaf50529..9d3ac998fc1f 100644
--- a/trunk/drivers/pcmcia/cardbus.c
+++ b/trunk/drivers/pcmcia/cardbus.c
@@ -105,8 +105,17 @@ int __ref cb_alloc(struct pcmcia_socket *s)
  */
 void cb_free(struct pcmcia_socket *s)
 {
-	struct pci_dev *bridge = s->cb_dev;
+	struct pci_dev *bridge, *dev, *tmp;
+	struct pci_bus *bus;
 
-	if (bridge)
-		pci_stop_and_remove_behind_bridge(bridge);
+	bridge = s->cb_dev;
+	if (!bridge)
+		return;
+
+	bus = bridge->subordinate;
+	if (!bus)
+		return;
+
+	list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list)
+		pci_stop_and_remove_bus_device(dev);
 }