summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorisaki <isaki@NetBSD.org>2021-02-06 07:16:18 +0000
committerisaki <isaki@NetBSD.org>2021-02-06 07:16:18 +0000
commitfa6da0bf1fcd5c3d3055f4ea6d3a2eae6a4df47c (patch)
tree4f6ae154c4bc5d14b58cc49ac1910570a1bf804a /sys/dev/isa
parent2b8075d6a336d70828fef6c15060e9795c8c0e6e (diff)
Calling halt_{input,output} is done by the MI audio layer if necessary.
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/gus.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 2ea56229b3a..86f753b1e99 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.118 2020/02/29 05:51:11 isaki Exp $ */
+/* $NetBSD: gus.c,v 1.119 2021/02/06 07:16:18 isaki Exp $ */
/*-
* Copyright (c) 1996, 1999, 2008 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.118 2020/02/29 05:51:11 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.119 2021/02/06 07:16:18 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1359,14 +1359,10 @@ gusclose(void *addr)
sc = addr;
DPRINTF(("gus_close: sc=%p\n", sc));
+ KASSERT((sc->sc_flags & (GUS_DMAOUT_ACTIVE | GUS_LOCKED)) == 0);
+ KASSERT((sc->sc_flags & GUS_DMAIN_ACTIVE) == 0);
-/* if (sc->sc_flags & GUS_DMAOUT_ACTIVE) */ {
- gus_halt_out_dma(sc);
- }
-/* if (sc->sc_flags & GUS_DMAIN_ACTIVE) */ {
- gus_halt_in_dma(sc);
- }
- sc->sc_flags &= ~(GUS_OPEN|GUS_LOCKED|GUS_DMAOUT_ACTIVE|GUS_DMAIN_ACTIVE);
+ sc->sc_flags &= ~GUS_OPEN;
/* turn off speaker, etc. */