diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-30 19:28:36 +0100 |
| commit | 3847b272248a3a4ed70d20392cc0454917f7713b (patch) | |
| tree | 2df5f60ebf35b128bbe7509a878829236c6cfcab /arch/alpha/kernel/pci.c | |
| parent | 5a5375977b721503e4d6b37ab8982902cd2d10b3 (diff) | |
| parent | bb2bc55a694d45cdeda91b6f28ab2adec28125ef (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge all pending fixes and refresh the tree, before applying new changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/kernel/pci.c')
| -rw-r--r-- | arch/alpha/kernel/pci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index 076c35cd6cde..98a1525fa164 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -285,8 +285,12 @@ pcibios_claim_one_bus(struct pci_bus *b) if (r->parent || !r->start || !r->flags) continue; if (pci_has_flag(PCI_PROBE_ONLY) || - (r->flags & IORESOURCE_PCI_FIXED)) - pci_claim_resource(dev, i); + (r->flags & IORESOURCE_PCI_FIXED)) { + if (pci_claim_resource(dev, i) == 0) + continue; + + pci_claim_bridge_resource(dev, i); + } } } |