Index: xserver-xorg-video-savage-2.1.2/src/savage_driver.c
===================================================================
--- xserver-xorg-video-savage-2.1.2.orig/src/savage_driver.c	2007-07-07 11:22:06.000000000 +0200
+++ xserver-xorg-video-savage-2.1.2/src/savage_driver.c	2007-07-07 11:28:35.000000000 +0200
@@ -549,6 +549,10 @@
     if( !psav->NoPCIRetry )
 	return 0;
 
+    /* in case we should not have been here */
+    if( !psav->ShadowVirtual )
+	return 0;
+
     psav->ShadowCounter = (psav->ShadowCounter + 1) & 0xffff;
     if (psav->ShadowCounter == 0)
 	psav->ShadowCounter++; /* 0 is reserved for the BIOS