diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-07 09:24:24 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-07 09:24:24 (GMT) |
| commit | 25a9a924c0c8723ced99179eb639e8c5372a2557 (patch) | |
| tree | 83170168d50b9703486327b5b3a0bfb1d8da9b2b /arch/ia64/pci/pci.c | |
| parent | 0b101e62afe626ecae60173f92f1e0ec72151653 (diff) | |
| parent | a0eeb8dd34f21fddfe85b37832b5f3d02ee6e34b (diff) | |
| download | linux-25a9a924c0c8723ced99179eb639e8c5372a2557.tar.xz | |
Merge branch 'linus' into x86/asm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index d89b601..7cc3be9 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); |