diff options
author | Olivier Galibert <galibert@pobox.com> | 2007-02-13 07:26:20 -0500 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-02-13 07:26:20 -0500 |
commit | 5f027387bbdb5a4a4c1babd557fd976cd09d7495 (patch) | |
tree | bb63f9bc5e90b175a466f9deda226088219e726c /arch/i386 | |
parent | b78673944b22b662b270c8bba5c198f19e4ee4e1 (diff) |
[PATCH] i386: Only call unreachable_devices() when type 1 is available.
unreachable_devices compares between the results of pci configuration accesses
through type1 and mmconfig, so it should be called only if type1 actually
works in the first place.
Signed-off-by: Olivier Galibert <galibert@pobox.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/pci/mmconfig-shared.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/pci/mmconfig-shared.c b/arch/i386/pci/mmconfig-shared.c index 998e04f6d68f..779c987acc5b 100644 --- a/arch/i386/pci/mmconfig-shared.c +++ b/arch/i386/pci/mmconfig-shared.c | |||
@@ -80,7 +80,8 @@ void __init pci_mmcfg_init(int type) | |||
80 | } | 80 | } |
81 | 81 | ||
82 | if (pci_mmcfg_arch_init()) { | 82 | if (pci_mmcfg_arch_init()) { |
83 | unreachable_devices(); | 83 | if (type == 1) |
84 | unreachable_devices(); | ||
84 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; | 85 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; |
85 | } | 86 | } |
86 | } | 87 | } |