diff --git a/sys/arm/s3c2xx0/s3c2xx0_space.c b/sys/arm/s3c2xx0/s3c2xx0_space.c
index ab72370b925f..742d7f3bc508 100644
--- a/sys/arm/s3c2xx0/s3c2xx0_space.c
+++ b/sys/arm/s3c2xx0/s3c2xx0_space.c
@@ -200,21 +200,21 @@ s3c2xx0_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
 void
 s3c2xx0_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size)
 {
-	vm_offset_t va, endva;
+	vm_offset_t va, endva, origva;
 
-	if (pmap_devmap_find_va((vm_offset_t)t, size) != NULL) {
+	if (pmap_devmap_find_va((vm_offset_t)h, size) != NULL) {
 		/* Device was statically mapped; nothing to do. */
 		return;
 	}
 
-	endva = round_page((vm_offset_t)t + size);
-	va = trunc_page((vm_offset_t)t);
+	endva = round_page((vm_offset_t)h + size);
+	origva = va = trunc_page((vm_offset_t)h);
 
 	while (va < endva) {
 		pmap_kremove(va);
 		va += PAGE_SIZE;
 	}
-	kva_free(va, endva - va);
+	kva_free(va, endva - origva);
 }
 
 int