aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-01-11 13:27:19 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-01-11 13:27:19 -0600
commit3411d1176102249f0e85dfc01820940e2faa7d13 (patch)
treefe3bdf39ef067a8e424a814cd052c2bab37884a7
parenta179012e37ae75de1fa7d6597e69d985ef79b7d0 (diff)
downloadu-boot-midas-3411d1176102249f0e85dfc01820940e2faa7d13.tar.gz
u-boot-midas-3411d1176102249f0e85dfc01820940e2faa7d13.tar.bz2
u-boot-midas-3411d1176102249f0e85dfc01820940e2faa7d13.zip
Report back PCI bus when doing table based device config
Patch by Kumar Gala 11 Jan 2006
-rw-r--r--CHANGELOG3
-rw-r--r--drivers/pci.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 60d29aca79..761f3a46fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Report back PCI bus when doing table based device config
+ Patch by Kumar Gala 11 Jan 2006
+
* Added support for PCI prefetchable region and BARs
If a host controller sets up a region as prefetchable and
a device's BAR denotes it as prefetchable, allocate the
diff --git a/drivers/pci.c b/drivers/pci.c
index 5360030661..3c24b99c37 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -459,6 +459,7 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev));
if (cfg) {
cfg->config_device(hose, dev, cfg);
+ sub_bus = max(sub_bus, hose->current_busno);
#ifdef CONFIG_PCI_PNP
} else {
int n = pciauto_config_device(hose, dev);