summaryrefslogtreecommitdiffstats
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-10-12 09:51:18 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-12 09:51:18 +0200
commitb9f27c0f4f7db9e5a4ba59228442a75d3177470c (patch)
tree49ab61b7e06a5a592f3541e84d1b5908a1d8030f /arch/ia64/pci
parent9fc4468d546b6eb55b0aa5b04b0c36238ebf57e7 (diff)
parent25cb62b76430a91cc6195f902e61c2cb84ade622 (diff)
downloadlinux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.bz2
Merge tag 'v4.3-rc5' into timers/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/pci')
-rw-r--r--arch/ia64/pci/pci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index d89b6013c941..7cc3be9fa7c6 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -533,9 +533,10 @@ void pcibios_fixup_bus(struct pci_bus *b)
{
struct pci_dev *dev;
- if (b->self)
+ if (b->self) {
+ pci_read_bridge_bases(b);
pcibios_fixup_bridge_resources(b->self);
-
+ }
list_for_each_entry(dev, &b->devices, bus_list)
pcibios_fixup_device_resources(dev);
platform_pci_fixup_bus(b);