diff options
| author | Andreas Noever <andreas.noever@gmail.com> | 2014-01-23 15:59:23 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-10 19:12:06 -0500 |
| commit | 619c8c310f7f21e59a7e2b53795183c34401a599 (patch) | |
| tree | 70c22a18fe88083dac715a3b8506fc9941acc291 | |
| parent | 2ed8582341f651ca14d00ab0ada4b46f493e1fcb (diff) | |
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>
| -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) | |||
| 831 | * do in the second pass. | 831 | * do in the second pass. |
| 832 | */ | 832 | */ |
| 833 | if (!pass) { | 833 | if (!pass) { |
| 834 | if (pcibios_assign_all_busses() || broken) | 834 | if (pcibios_assign_all_busses() || broken || is_cardbus) |
| 835 | /* Temporarily disable forwarding of the | 835 | /* Temporarily disable forwarding of the |
| 836 | configuration cycles on all bridges in | 836 | configuration cycles on all bridges in |
| 837 | this bus segment to avoid possible | 837 | this bus segment to avoid possible |