Module Name: src
Committed By: martin
Date: Sat May 16 18:24:44 UTC 2009
Modified Files:
src/sys/dev/sbus: dbri.c
Log Message:
we can not free() a dmamap!
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/sbus/dbri.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/dbri.c
diff -u src/sys/dev/sbus/dbri.c:1.22 src/sys/dev/sbus/dbri.c:1.23
--- src/sys/dev/sbus/dbri.c:1.22 Tue May 12 13:20:05 2009
+++ src/sys/dev/sbus/dbri.c Sat May 16 18:24:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dbri.c,v 1.22 2009/05/12 13:20:05 cegger Exp $ */
+/* $NetBSD: dbri.c,v 1.23 2009/05/16 18:24:44 martin Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig ([email protected])
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.22 2009/05/12 13:20:05 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.23 2009/05/16 18:24:44 martin Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -2102,7 +2102,19 @@
static void
dbri_free(void *v, void *p, struct malloc_type *mt)
{
- free(p, mt);
+ struct dbri_softc *sc = v;
+ struct dbri_desc *dd;
+ int i;
+
+ for (i = 0; i < sc->sc_desc_used; i++) {
+ dd = &sc->sc_desc[i];
+ if (dd->buf == p)
+ break;
+ }
+ if (i >= sc->sc_desc_used)
+ return;
+ bus_dmamap_unload(sc->sc_dmat, dd->dmamap);
+ bus_dmamap_destroy(sc->sc_dmat, dd->dmamap);
}
static paddr_t
