rk fb: if uboot-logo-on set 1, open iommu when iommu en

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / cardbus.c

diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 24caeaf50529c06d23edfdab59ed70ab97700e42..9d3ac998fc1fac6bbfc35efb0ffac398613f6882 100644 (file)
--- a/drivers/pcmcia/cardbus.c
+++ b/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);
 }