Merged exa_branch between revisions 84 and 86.

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1753b5b..e77fb83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-26  Thomas Hellström  <unichrome-at-shipmail-dot-org>
+
+	* unichrome/via_accel.c: (viaFlushDRIEnabled), (viaSetupCBuffer):
+
+	- Merged EXA branch changes between revisions 84 and 86.
+
 2005-11-23  Thomas Hellström  <unichrome-at-shipmail-dot-org>
 
 	* unichrome/via_accel.c: (viaFlushPCI), (viaFlushDRIEnabled),
diff --git a/unichrome/via_accel.c b/unichrome/via_accel.c
index 805ea47..9911a49 100644
--- a/unichrome/via_accel.c
+++ b/unichrome/via_accel.c
@@ -99,7 +99,7 @@ viaFlushDRIEnabled(ViaCommandBuffer * cb)
     drm_via_cmdbuffer_t b;
 
     if (pVia->agpDMA) {
-	do {
+	while (tmpSize > 0) {
 	    b.size = (tmpSize > VIA_DMASIZE) ? VIA_DMASIZE : tmpSize;
 	    tmpSize -= b.size;
 	    b.buf = tmp;
@@ -111,7 +111,7 @@ viaFlushDRIEnabled(ViaCommandBuffer * cb)
 		cb->flushFunc = viaFlushPCI;
 		return;
 	    }
-	} while (tmpSize > 0);
+	}
 	cb->pos = 0;
     } else {
 	cb->flushFunc = viaFlushPCI;
@@ -130,7 +130,7 @@ viaSetupCBuffer(ScrnInfoPtr pScrn, ViaCommandBuffer * buf, unsigned size)
 {
     buf->pScrn = pScrn;
     buf->bufSize = ((size == 0) ? VIA_DMASIZE : size) >> 2;
-    buf->buf = (CARD32 *) xcalloc(buf->bufSize, 1);
+    buf->buf = (CARD32 *) xcalloc(buf->bufSize, sizeof(CARD32));
     if (!buf->buf)
 	return BadAlloc;
     buf->waitFlags = 0;