summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pci.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-04-08 17:04:55 +0200
committerBjorn Helgaas <bhelgaas@google.com>2015-04-08 17:04:55 +0200
commitd10b730f97a7f1fa58c9ec300828f87157cd6b95 (patch)
tree3b7f531492e310154c6a2939cf619717bfe9a383 /arch/sparc/kernel/pci.c
parentPCI: Don't look for ACPI hotplug parameters if ACPI is disabled (diff)
downloadlinux-d10b730f97a7f1fa58c9ec300828f87157cd6b95.tar.xz
linux-d10b730f97a7f1fa58c9ec300828f87157cd6b95.zip
Revert "sparc/PCI: Clip bridge windows to fit in upstream windows"
This reverts commit d63e2e1f3df904bf6bd150bdafb42ddbb3257ea8. David Ahern reported that d63e2e1f3df9 breaks booting on an 8-socket T5 sparc system. He also verified that the system boots with d63e2e1f3df9 reverted. Yinghai has some fixes, but they need a little more polishing than we can do before v4.0. Link: http://lkml.kernel.org/r/5514391F.2030300@oracle.com # report Link: http://lkml.kernel.org/r/1427857069-6789-1-git-send-email-yinghai@kernel.org # patches Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: stable@vger.kernel.org # v3.19+
Diffstat (limited to '')
-rw-r--r--arch/sparc/kernel/pci.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 9ce5afe167ff..b36365f49478 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -639,10 +639,7 @@ static void pci_claim_bus_resources(struct pci_bus *bus)
(unsigned long long)r->end,
(unsigned int)r->flags);
- if (pci_claim_resource(dev, i) == 0)
- continue;
-
- pci_claim_bridge_resource(dev, i);
+ pci_claim_resource(dev, i);
}
}