1 files changed, 13 insertions, 13 deletions

diff --git a/src/via_driver.c b/src/via_driver.c
index a83cbed..4750b8e 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -469,27 +469,27 @@ VIAFreeRec(ScrnInfoPtr pScrn)
 
     if (pVia->Crtc[0]) {
         if (pVia->Crtc[0]->Name)
-            xfree(pVia->Crtc[0]->Name);
-        xfree(pVia->Crtc[0]);
+            free(pVia->Crtc[0]->Name);
+        free(pVia->Crtc[0]);
     }
 
     if (pVia->Crtc[1]) {
         if (pVia->Crtc[1]->Name)
-            xfree(pVia->Crtc[1]->Name);
-        xfree(pVia->Crtc[1]);
+            free(pVia->Crtc[1]->Name);
+        free(pVia->Crtc[1]);
     }
 
     ViaOutputsDestroy(pScrn->scrnIndex);
 
     if (pVia->Scratch)
-        xfree(pVia->Scratch);
+        free(pVia->Scratch);
 
     if (pVia->SavedReg.VGAFB)
-        xfree(pVia->SavedReg.VGAFB);
+        free(pVia->SavedReg.VGAFB);
 
     VIAUnmapMem(pScrn);
 
-    xfree(pScrn->driverPrivate);
+    free(pScrn->driverPrivate);
     pScrn->driverPrivate = NULL;
 }
 
@@ -670,7 +670,7 @@ VIAProbe(DriverPtr drv, int flags)
     numUsed = xf86MatchPciInstances("unichrome", PCI_VENDOR_VIA, VIAChipsets,
                                     VIAPciChipsets, devSections, numDevSections,
                                     drv, &usedChips);
-    xfree(devSections);
+    free(devSections);
 
     if (numUsed <= 0)
         return FALSE;
@@ -692,7 +692,7 @@ VIAProbe(DriverPtr drv, int flags)
 	}
     }
 
-    xfree(usedChips);
+    free(usedChips);
 
     return foundScreen;
 }
@@ -1129,7 +1129,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
     {
 	EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 	if (pEnt->resources) {
-	    xfree(pEnt);
+	    free(pEnt);
 	    VIAFreeRec(pScrn);
 	    return FALSE;
 	}
@@ -1139,7 +1139,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
 	pVia->ChipId = pVia->PciInfo->chipType;
 	pVia->Chipset = pEnt->chipset;
 	pScrn->chipset = (char *)xf86TokenToString(VIAChipsets, pVia->Chipset);
-	xfree(pEnt);
+	free(pEnt);
     }
 #endif
 
@@ -2395,7 +2395,7 @@ VIAInternalScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
 
     if (pVia->AccelMethod == VIA_ACCEL_SHADOWFB) {
 	pVia->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
-	pVia->ShadowPtr = xalloc(pVia->ShadowPitch * height);
+	pVia->ShadowPtr = xnfcalloc(1, pVia->ShadowPitch * height);
 	displayWidth = pVia->ShadowPitch / (pScrn->bitsPerPixel >> 3);
 	FBStart = pVia->ShadowPtr;
     } else {
@@ -2500,7 +2500,7 @@ VIACloseScreen(int scrnIndex, ScreenPtr pScreen)
     }
 
     if (pVia->ShadowPtr) {
-        xfree(pVia->ShadowPtr);
+        free(pVia->ShadowPtr);
         pVia->ShadowPtr = NULL;
     }