diff options
| author | Andreas Noever <andreas.noever@gmail.com> | 2014-01-24 00:59:23 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-11 04:12:06 +0400 |
| commit | 619c8c310f7f21e59a7e2b53795183c34401a599 (patch) | |
| tree | 70c22a18fe88083dac715a3b8506fc9941acc291 /drivers | |
| parent | 2ed8582341f651ca14d00ab0ada4b46f493e1fcb (diff) | |
| download | linux-619c8c310f7f21e59a7e2b53795183c34401a599.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 511a8f6d7636..5dc8e1a31e4f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -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 |