summaryrefslogtreecommitdiff
path: root/sys/arch/socppc
diff options
context:
space:
mode:
authorAriane van der Steldt <ariane@cvs.openbsd.org>2011-06-23 20:44:40 +0000
committerAriane van der Steldt <ariane@cvs.openbsd.org>2011-06-23 20:44:40 +0000
commit0f28a042eb41d7327f657e3ee9d5b5ebb45b4ae9 (patch)
treea61d9cd4563d488aa9cbe1e1373ba909d2215ccf /sys/arch/socppc
parent7d92efd246de448e6fb91f652014db2db9853704 (diff)
Fix the error path in bus_dmamem_map.
As discussed on icb: remove the comment, remove pmap_remove (uvm_km_free does that for us). ok oga@, deraadt@
Diffstat (limited to 'sys/arch/socppc')
-rw-r--r--sys/arch/socppc/socppc/dma.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/socppc/socppc/dma.c b/sys/arch/socppc/socppc/dma.c
index 856d56cfbcf..4ede1757b6d 100644
--- a/sys/arch/socppc/socppc/dma.c
+++ b/sys/arch/socppc/socppc/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.8 2010/12/26 15:41:00 miod Exp $ */
+/* $OpenBSD: dma.c,v 1.9 2011/06/23 20:44:39 ariane Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -483,12 +483,8 @@ _dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, size_t size,
VM_PROT_READ | VM_PROT_WRITE, VM_PROT_READ |
VM_PROT_WRITE | PMAP_WIRED | PMAP_CANFAIL);
if (error) {
- /*
- * Clean up after ourselves.
- * XXX uvm_wait on WAITOK
- */
pmap_update(pmap_kernel());
- uvm_km_free(kernel_map, va, ssize);
+ uvm_km_free(kernel_map, sva, ssize);
return (error);
}
}