redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Andreas Noever 2014-01-23 21:59:23 +01:00 committed by Bjorn Helgaas
parent 2ed8582341
commit 619c8c310f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pci/probe.c
View File

@ -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