tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e

[profile/ivi/kernel-adaptation-intel-automotive.git] / arch / tile / kernel / pci.c

diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 87422ed..33c1086 100644 (file)
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -369,7 +369,7 @@ int __init pcibios_init(void)
                                 */
                                if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
                                        (PCI_SLOT(dev->devfn) == 0)) {
-                                       next_bus = dev->busn_res.end;
+                                       next_bus = dev->subordinate;
                                        controllers[i].mem_resources[0] =
                                                *next_bus->resource[0];
                                        controllers[i].mem_resources[1] =
@@ -404,16 +404,6 @@ void pcibios_set_master(struct pci_dev *dev)
 }
 
 /*
- * This can be called from the generic PCI layer, but doesn't need to
- * do anything.
- */
-char __devinit *pcibios_setup(char *str)
-{
-       /* Nothing needs to be done. */
-       return str;
-}
-
-/*
  * This is called from the generic Linux layer.
  */
 void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)