summaryrefslogtreecommitdiff
path: root/hw/xfree86/os-support/bus/ix86Pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/os-support/bus/ix86Pci.c')
-rw-r--r--hw/xfree86/os-support/bus/ix86Pci.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c
index b135d0b73..da1aa7d2f 100644
--- a/hw/xfree86/os-support/bus/ix86Pci.c
+++ b/hw/xfree86/os-support/bus/ix86Pci.c
@@ -272,10 +272,16 @@ void ix86PciSelectCfgmech(void)
*/
switch (xf86Info.pciFlags) {
- case PCIProbe1: /* { */
+ case PCIOsConfig:
+#if ARCH_PCI_OS_INIT
+ return;
+#endif
+
+ case PCIProbe1:
- xf86MsgVerb(X_INFO, 2, "PCI: Probing config type using method 1\n");
- oldVal1 = inl(PCI_CFGMECH1_ADDRESS_REG);
+ xf86MsgVerb(X_INFO, 2,
+ "PCI: Probing config type using method 1\n");
+ oldVal1 = inl(PCI_CFGMECH1_ADDRESS_REG);
#ifdef DEBUGPCI
if (xf86Verbose > 2) {
@@ -492,9 +498,6 @@ void ix86PciSelectCfgmech(void)
ix86Pci0.funcs = &ix86Funcs2;
return;
- case PCIOsConfig:
- return;
-
case PCIForceNone:
break;
}