PCI: Use request_resource_conflict() instead of insert_ for bus numbers

If a conflict happens during insert_resource_conflict() and all conflicts
fit within the newly inserted resource then they will become children of
the new resource. This is almost certainly not what we want for bus
numbers.

Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 5dc8e1a31e4f11c32dfff0c1796e855906e2adbc..21f162c5c7bb768d40220cfc516511c904e3e8cf 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1835,7 +1835,7 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
                res->flags |= IORESOURCE_PCI_FIXED;
        }
 
-       conflict = insert_resource_conflict(parent_res, res);
+       conflict = request_resource_conflict(parent_res, res);
 
        if (conflict)
                dev_printk(KERN_DEBUG, &b->dev,