diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index ffa906505..4bc189bbd 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -954,10 +954,13 @@ xf86scanpci(int flags)
     pciBusInfo_t *busp;
     int          idx = 0, i;
     PCITAG       tag;
+    static Bool  done = FALSE;
 
-    if (pci_devp[0])
+    if (done || pci_devp[0])
 	return pci_devp;
 
+    done = TRUE;
+
     pciInit();
 
 #ifdef XF86SCANPCI_WRAPPER