Index: lib/GL/glx/glxext.c
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/glx/glxext.c,v
retrieving revision 1.6
diff -u -p -r1.6 glxext.c
--- lib/GL/glx/glxext.c	30 Sep 2004 21:37:00 -0000	1.6
+++ lib/GL/glx/glxext.c	4 Oct 2004 15:42:03 -0000
@@ -730,7 +730,7 @@ CallCreateNewScreen(Display *dpy, int sc
     __DRIscreenPrivate *psp = NULL;
 #ifndef GLX_USE_APPLEGL
     drm_handle_t hSAREA;
-    drmAddress pSAREA;
+    drmAddress pSAREA = MAP_FAILED;
     char *BusID;
     __DRIversion   ddx_version;
     __DRIversion   dri_version;
@@ -751,7 +751,8 @@ CallCreateNewScreen(Display *dpy, int sc
     err_msg = "XF86DRIOpenConnection";
     err_extra = NULL;
 
-    framebuffer.dev_priv = NULL;
+    memset (&framebuffer, 0, sizeof (framebuffer));
+    framebuffer.base = MAP_FAILED;
 
     if (XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
 	fd = drmOpen(NULL,BusID);
Index: extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 dri_util.c
--- extras/Mesa/src/mesa/drivers/dri/common/dri_util.c	12 Aug 2004 23:05:42 -0000	1.1.1.3
+++ extras/Mesa/src/mesa/drivers/dri/common/dri_util.c	4 Oct 2004 15:42:03 -0000
@@ -1347,7 +1347,7 @@ __driUtilCreateScreen(Display *dpy, int 
     int directCapable;
     __DRIscreenPrivate *psp = NULL;
     drm_handle_t hSAREA;
-    drmAddress pSAREA;
+    drmAddress pSAREA = MAP_FAILED;
     char *BusID;
     __GLcontextModes *modes;
     __GLcontextModes *temp;
@@ -1388,6 +1388,8 @@ __driUtilCreateScreen(Display *dpy, int 
 
     err_msg = "XF86DRIOpenConnection";
     err_extra = NULL;
+    memset (&framebuffer, 0, sizeof (framebuffer));
+    framebuffer.base = MAP_FAILED;
 
     if (XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
 	fd = drmOpen(NULL,BusID);