summaryrefslogtreecommitdiff
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorAndreas Noever <andreas.noever@gmail.com>2014-01-24 00:59:24 +0400
committerBjorn Helgaas <bhelgaas@google.com>2014-02-11 04:12:23 +0400
commitced04d15519a15d38b46162b94a1f26b4022116e (patch)
tree121737d1cf847ed82780eff5e138582dd292039f /drivers/pci/probe.c
parent619c8c310f7f21e59a7e2b53795183c34401a599 (diff)
downloadlinux-ced04d15519a15d38b46162b94a1f26b4022116e.tar.xz
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>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 5dc8e1a31e4f..21f162c5c7bb 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,