Index: programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c
===================================================================
RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c	30 Jul 2004 20:30:51 -0000	1.3
+++ programs/Xserver/hw/xfree86/drivers/ati/atiprobe.c	18 Oct 2004 14:21:45 -0000	1.4
@@ -1554,6 +1554,9 @@
                     continue;
 
                 pPCI = pVideo->thisCard;
+		if (pPCI == NULL)
+		    continue;
+		
                 PciReg = pciReadLong(pPCI->tag, PCI_REG_USERCONFIG);
                 j = PciReg & 0x03U;
                 if (j == 0x03U)