Commit ced04d15 authored Jan 23, 2014 by Andreas Noever Committed by Bjorn Helgaas Feb 10, 2014

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>

parent 619c8c31

drivers/pci/probe.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1835,7 +1835,7 @@ int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int bus_max)
	res->flags \|= IORESOURCE_PCI_FIXED;		res->flags \|= IORESOURCE_PCI_FIXED;
	}		}

	conflict = insert_resource_conflict(parent_res, res);		conflict = request_resource_conflict(parent_res, res);

	if (conflict)		if (conflict)
	dev_printk(KERN_DEBUG, &b->dev,		dev_printk(KERN_DEBUG, &b->dev,