diff --git a/ChangeLog b/ChangeLog
index 607a7cc7b..fb20efe27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/dmx/input/dmxconsole.c:
+	Coverity #1005: Avoid a null deref.
+
 2006-04-14  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/dmx/input/dmxinputinit.c:
diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c
index 7a313aadd..835909e6c 100644
--- a/hw/dmx/input/dmxconsole.c
+++ b/hw/dmx/input/dmxconsole.c
@@ -696,10 +696,11 @@ static void dmxConsoleComputeWidthHeight(myPrivate *priv,
 void dmxConsoleReInit(DevicePtr pDev)
 {
     GETPRIVFROMPDEV;
-    Display *dpy = priv->display;
+    Display *dpy;
 
     if (!priv || !priv->initialized) return;
-    
+    dpy = priv->display;
+
     dmxConsoleComputeWidthHeight(priv,
                                  &priv->width, &priv->height,
                                  &priv->xScale, &priv->yScale,