summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-01-15 09:15:53 +0000
committerKeith Packard <keithp@keithp.com>2004-01-15 09:15:53 +0000
commit3867e03cb63e49aeb1742a8a4bdaed0b7a23749e (patch)
treeb5272c3f489c69051070e47b6e9e1636da6dde97
parentf233bbf3652327e62e03efbb8a355e6af2703a1c (diff)
Fix up some mis-used variable names
-rw-r--r--hw/kdrive/vesa/vm86.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c
index 85200fdad..d5289983b 100644
--- a/hw/kdrive/vesa/vm86.c
+++ b/hw/kdrive/vesa/vm86.c
@@ -81,7 +81,7 @@ Vm86Setup(int mapHoles)
}
devzero = open("/dev/zero", O_RDWR);
- if(devmem < 0) {
+ if(devzero < 0) {
perror("open /dev/zero");
goto fail;
}
@@ -180,9 +180,9 @@ Vm86Setup(int mapHoles)
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 @@ void
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);
}