summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2012-07-25 15:49:23 -0400
committerChris Metcalf <cmetcalf@tilera.com>2012-07-25 18:22:46 -0400
commit7f240b7db0956a426075eca73cc7ddf9fefa22a9 (patch)
tree7693a69f9951ff86f39eeb12c0cb82bb2147e8ec
parentd41ca6dfea695777abfa35eaec863bfe2434ca54 (diff)
downloadlinux-3.10-7f240b7db0956a426075eca73cc7ddf9fefa22a9.tar.gz
linux-3.10-7f240b7db0956a426075eca73cc7ddf9fefa22a9.tar.bz2
linux-3.10-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>
-rw-r--r--arch/tile/kernel/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 0fdd99d0d8b..33c10864d2f 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] =