Index: programs/Xserver/hw/xfree86/common/xf86Init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 xf86Init.c
--- programs/Xserver/hw/xfree86/common/xf86Init.c	20 Aug 2004 05:22:39 -0000	1.12
+++ programs/Xserver/hw/xfree86/common/xf86Init.c	17 Sep 2004 12:28:49 -0000
@@ -1244,7 +1244,7 @@ AbortDDX()
   /*
    * try to deinitialize all input devices
    */
-  if (xf86Info.pKeyboard)
+  if (xf86Info.kbdProc && xf86Info.pKeyboard)
     (xf86Info.kbdProc)(xf86Info.pKeyboard, DEVICE_CLOSE);
 
   /*