PCI: Use request_resource_conflict() instead of insert_ for bus numbers
authorAndreas Noever <andreas.noever@gmail.com>
Thu, 23 Jan 2014 20:59:24 +0000 (21:59 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 11 Feb 2014 00:12:23 +0000 (17:12 -0700)
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>
drivers/pci/probe.c

Simple merge