From: Andreas Noever <andreas.noever@gmail.com>
Date: Thu, 23 Jan 2014 20:59:24 +0000 (+0100)
Subject: PCI: Use request_resource_conflict() instead of insert_ for bus numbers
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ced04d15519a15d38b46162b94a1f26b4022116e;p=linux.git

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 5dc8e1a31e4f1..21f162c5c7bb7 100644
--- 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,