summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/unichrome/via_screen.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2005-08-30 19:14:23 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2005-08-30 19:14:23 +0000
commitd5cc77e37c59b9ab635cbc90151f1b2fc69201c6 (patch)
tree6351316f7b9e7afabbebd94eee870c3436e335b2 /src/mesa/drivers/dri/unichrome/via_screen.c
parent156dc55628ee3d846598a6906d09afd18d2b8e1c (diff)
Fixes from https://bugs.freedesktop.org/attachment.cgi?id=3077
Diffstat (limited to 'src/mesa/drivers/dri/unichrome/via_screen.c')
-rw-r--r--src/mesa/drivers/dri/unichrome/via_screen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_screen.c b/src/mesa/drivers/dri/unichrome/via_screen.c
index 50342f3ff5..4ca4a071a5 100644
--- a/src/mesa/drivers/dri/unichrome/via_screen.c
+++ b/src/mesa/drivers/dri/unichrome/via_screen.c
@@ -100,6 +100,7 @@ viaInitDriver(__DRIscreenPrivate *sPriv)
PFNGLXSCRENABLEEXTENSIONPROC glx_enable_extension =
(PFNGLXSCRENABLEEXTENSIONPROC) (*dri_interface->getProcAddress("glxEnableExtension"));
void * const psc = sPriv->psc->screenConfigs;
+ drmAddress map;
if (sPriv->devPrivSize != sizeof(VIADRIRec)) {
fprintf(stderr,"\nERROR! sizeof(VIADRIRec) does not match passed size from device driver\n");
@@ -150,7 +151,7 @@ viaInitDriver(__DRIscreenPrivate *sPriv)
if (drmMap(sPriv->fd,
gDRIPriv->regs.handle,
gDRIPriv->regs.size,
- (drmAddress *)&viaScreen->reg) != 0) {
+ &map) != 0) {
FREE(viaScreen);
sPriv->private = NULL;
__driUtilMessage("viaInitDriver: drmMap regs failed");
@@ -162,8 +163,8 @@ viaInitDriver(__DRIscreenPrivate *sPriv)
gDRIPriv->agp.handle,
gDRIPriv->agp.size,
(drmAddress *)&viaScreen->agpLinearStart) != 0) {
- FREE(viaScreen);
drmUnmap(viaScreen->reg, gDRIPriv->agp.size);
+ FREE(viaScreen);
sPriv->private = NULL;
__driUtilMessage("viaInitDriver: drmMap agp failed");
return GL_FALSE;