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

PCI: Assign CardBus bus number only during the second pass



Right now the CardBus code in pci_scan_bridge() is executed during both
passes. Since we always allocate the bus number ourselves it makes sense
to put it into the second pass.

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

parent 2ed85823

drivers/pci/probe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -831,7 +831,7 @@ int pci_scan_bridge(struct pci_bus bus, struct pci_dev dev, int max, int pass)
		* do in the second pass.
		*/
		if (!pass) {
		if (pcibios_assign_all_busses() \|\| broken)
		if (pcibios_assign_all_busses() \|\| broken \|\| is_cardbus)
		/* Temporarily disable forwarding of the
		configuration cycles on all bridges in
		this bus segment to avoid possible