[xserver-commit] xserver/hw/kdrive/vesa vm86.c,1.8,1.9

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/vesa
In directory pdx:/tmp/cvs-serv19676/hw/kdrive/vesa

Modified Files:
	vm86.c 
Log Message:
2004-01-15  Keith Packard  <keithp@keithp.com>
	* hw/kdrive/vesa/vm86.c: (Vm86Setup), (Vm86Cleanup):
	Fix up some mis-used variable names


Index: vm86.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/vesa/vm86.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vm86.c	15 Oct 2003 01:00:38 -0000	1.8
+++ vm86.c	15 Jan 2004 09:15:53 -0000	1.9
@@ -81,7 +81,7 @@
     }
 
     devzero = open("/dev/zero", O_RDWR);
-    if(devmem < 0) {
+    if(devzero < 0) {
 	perror("open /dev/zero");
 	goto fail;
     }
@@ -180,9 +180,9 @@
 
 unmapfail:
     if(magicMem != MAP_FAILED) munmap(magicMem, MAGICMEM_SIZE);
-    if(hole1 != MAP_FAILED) munmap(magicMem, HOLE1_SIZE);
+    if(hole1 != MAP_FAILED) munmap(hole1, HOLE1_SIZE);
     if(loMem != MAP_FAILED) munmap(loMem, LOMEM_SIZE);
-    if(hole2 != MAP_FAILED) munmap(magicMem, HOLE2_SIZE);
+    if(hole2 != MAP_FAILED) munmap(hole2, HOLE2_SIZE);
     if(hiMem != MAP_FAILED) munmap(hiMem, HIMEM_SIZE);
 fail:
     if(devmem >= 0)
@@ -198,9 +198,9 @@
 Vm86Cleanup(Vm86InfoPtr vi)
 {
     if(vi->magicMem != MAP_FAILED) munmap(vi->magicMem, MAGICMEM_SIZE);
-    if(vi->hole1 != MAP_FAILED) munmap(vi->magicMem, HOLE1_SIZE);
+    if(vi->hole1 != MAP_FAILED) munmap(vi->hole1, HOLE1_SIZE);
     if(vi->loMem != MAP_FAILED) munmap(vi->loMem, LOMEM_SIZE);
-    if(vi->hole2 != MAP_FAILED) munmap(vi->magicMem, HOLE2_SIZE);
+    if(vi->hole2 != MAP_FAILED) munmap(vi->hole2, HOLE2_SIZE);
     if(vi->hiMem != MAP_FAILED) munmap(vi->hiMem, HIMEM_SIZE);
     xfree(vi);
 }