diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 | 
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-14 16:36:29 +0200 | 
| commit | 3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae (patch) | |
| tree | fb66bf8861d9f78765160d734a438856f5317cdb /drivers/pci.c | |
| parent | 4ce846ec59f36b85d6644a769690ad3feb667575 (diff) | |
| parent | 4ef35e53c693556c54b0c22d6f873de87bade253 (diff) | |
| download | olio-uboot-2014.01-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.tar.xz olio-uboot-2014.01-3b3bff4cbf2cb14f9a3e7d03f26ebab900efe4ae.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers/pci.c')
| -rw-r--r-- | drivers/pci.c | 8 | 
1 files changed, 7 insertions, 1 deletions
| diff --git a/drivers/pci.c b/drivers/pci.c index 050582f78..41589192c 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -490,10 +490,16 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)  int pci_hose_scan(struct pci_controller *hose)  { +	/* Start scan at current_busno. +	 * PCIe will start scan at first_busno+1. +	 */ +	/* For legacy support, ensure current>=first */ +	if (hose->first_busno > hose->current_busno) +		hose->current_busno = hose->first_busno;  #ifdef CONFIG_PCI_PNP  	pciauto_config_init(hose);  #endif -	return pci_hose_scan_bus(hose, hose->first_busno); +	return pci_hose_scan_bus(hose, hose->current_busno);  }  void pci_init(void) |