Skip to content

Commit

Permalink
PCI: Clarify the "scan anyway" comment in pci_scan_bridge()
Browse files Browse the repository at this point in the history
Initially when we encountered a bus that was already present we skipped
it. Since 74710de 'PCI: always scan child buses' we continue
scanning in order to allow user triggered rescans of already existing
busses.

The old comment suggested that the reason for continuing the scan is a
bug in the i450NX chipset. This is not the case.

Signed-off-by: Andreas Noever <andreas.noever@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
  • Loading branch information
Andreas Noever authored and Bjorn Helgaas committed Feb 11, 2014
1 parent 9a4d7d8 commit 2ed8582
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/pci/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -805,11 +805,10 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
goto out;

/*
* If we already got to this bus through a different bridge,
* don't re-add it. This can happen with the i450NX chipset.
*
* However, we continue to descend down the hierarchy and
* scan remaining child buses.
* The bus might already exist for two reasons: Either we are
* rescanning the bus or the bus is reachable through more than
* one bridge. The second case can happen with the i450NX
* chipset.
*/
child = pci_find_bus(pci_domain_nr(bus), secondary);
if (!child) {
Expand Down

0 comments on commit 2ed8582

Please sign in to comment.