X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=arch%2Fmicroblaze%2Fpci%2Fpci-common.c;h=ae838ed5fcf2535ca5c047a2837adadc434735cd;hb=6de29ccb50f2caef07cdd888efc8cb933497b6a4;hp=6b8b75266801aaf25fe509985d2a5edd66ed3e8c;hpb=9786cff38a31c452e32fd2f9a479dd7d19d91712;p=cascardo%2Flinux.git

diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 6b8b75266801..ae838ed5fcf2 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -863,7 +863,14 @@ void pcibios_setup_bus_devices(struct pci_bus *bus)
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
-	/* Fixup the bus */
+	/* When called from the generic PCI probe, read PCI<->PCI bridge
+	 * bases. This is -not- called when generating the PCI tree from
+	 * the OF device-tree.
+	 */
+	if (bus->self != NULL)
+		pci_read_bridge_bases(bus);
+
+	/* Now fixup the bus bus */
 	pcibios_setup_bus_self(bus);
 
 	/* Now fixup devices on that bus */