diff options
| author |   Chris Metcalf <cmetcalf@tilera.com> | 2012-07-25 15:49:23 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2012-07-25 18:22:46 -0400 |
| commit | 7f240b7db0956a426075eca73cc7ddf9fefa22a9 (patch) | |
| tree | 7693a69f9951ff86f39eeb12c0cb82bb2147e8ec /arch/tile | |
| parent | tilegx pci: fix semantic merge conflict with 3527ed81c (diff) | |
| download | linux-dev-7f240b7db0956a426075eca73cc7ddf9fefa22a9.tar.xz linux-dev-7f240b7db0956a426075eca73cc7ddf9fefa22a9.zip | |
tilepro pci: fix pci_bus.subordinate bad bombing from b918c62e
The bombing to convert pci_bus.subordinate to busn_res.end accidentally
modified a "struct pci_dev" site, causing this file not to compile.
This commit reverts that code to use dev->subordinate again.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index 0fdd99d0d8b7..33c10864d2f7 100644 --- 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] = |