Merge branch 'pci/yinghai-misc' into next

2 files changed, 9 insertions, 3 deletions

diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 4b0970b46e0b..6241fd05bd41 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -87,11 +87,15 @@ EXPORT_SYMBOL_GPL(pci_bus_resource_n);
 void pci_bus_remove_resources(struct pci_bus *bus)
 {
         int i;
+        struct pci_bus_resource *bus_res, *tmp;
 
         for (i = 0; i < PCI_BRIDGE_RESOURCE_NUM; i++)
                 bus->resource[i] = NULL;
 
-        pci_free_resource_list(&bus->resources);
+        list_for_each_entry_safe(bus_res, tmp, &bus->resources, list) {
+                list_del(&bus_res->list);
+                kfree(bus_res);
+        }
 }
 
 /**
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 23961117663f..ec909afa90b6 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -729,8 +729,10 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
 
         /* Check if setup is sensible at all */
         if (!pass &&
-            (primary != bus->number || secondary <= bus->number)) {
-                dev_dbg(&dev->dev, "bus configuration invalid, reconfiguring\n");
+            (primary != bus->number || secondary <= bus->number ||
+             secondary > subordinate)) {
+                dev_info(&dev->dev, "bridge configuration invalid ([bus %02x-%02x]), reconfiguring\n",
+                         secondary, subordinate);
                 broken = 1;
         }