Fix via EXA after API update.

3 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f4134c..feb8715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-17  Thomas Hellstrom  <thomas-at-tungstengraphics.com>
+
+	* src/via_accel.c: (viaInitExa):
+	* src/via_driver.c: (VIAPreInit):
+	Fix via EXA after API update.
+
 2006-03-08  Thomas Hellstrom  <thomas-at-tungstengraphics.com>
 
 	* src/via_id.c:
diff --git a/src/via_accel.c b/src/via_accel.c
index 2a42fe9..ff702bd 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -2076,6 +2076,7 @@ viaInitExa(ScreenPtr pScreen)
     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
     VIAPtr pVia = VIAPTR(pScrn);
     ExaDriverPtr pExa = exaDriverAlloc();
+    memset(pExa, 0, sizeof(*pExa));
 
     if (!pExa)
 	return NULL;
diff --git a/src/via_driver.c b/src/via_driver.c
index 8ea855e..3637e72 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1462,27 +1462,24 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
 	if (pVia->useEXA) {
 	    XF86ModReqInfo req;
 	    int errmaj, errmin;
-
+	    memset(&req, 0, sizeof(req));
+ 
 	    req.majorversion = 2;
 	    req.minorversion = 0;
             if (!LoadSubModule(pScrn->module, "exa", NULL, NULL, NULL, &req,
-		&errmaj, &errmin))
-	    {
+		&errmaj, &errmin)) {
 		LoaderErrorMsg(NULL, "exa", errmaj, errmin);
 		VIAFreeRec(pScrn);
 		return FALSE;
 	    }
 	    xf86LoaderReqSymLists(exaSymbols, NULL);
-	} else {
+	} 
 #endif /* VIA_HAVE_EXA */
-	    if(!xf86LoadSubModule(pScrn, "xaa")) {
-		VIAFreeRec(pScrn);
-		return FALSE;
-	    }
-	    xf86LoaderReqSymLists(xaaSymbols, NULL);
-#ifdef VIA_HAVE_EXA
+	if(!xf86LoadSubModule(pScrn, "xaa")) {
+	    VIAFreeRec(pScrn);
+	    return FALSE;
 	}
-#endif /* VIA_HAVE_EXA */
+	xf86LoaderReqSymLists(xaaSymbols, NULL);
     }
 
     if (pVia->hwcursor) {