summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2004-09-02 02:09:10 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2004-09-02 02:09:10 +0000
commit96470889e16f4849bef406a9fe66f6e5aa3d53f6 (patch)
tree022f4c4f2a31b28e68afa8b19815993809144303 /sys/dev/pci
parent4074bda3c0a9eae0d432136c1b0689618061e124 (diff)
Prevent mixer from resetting volume back to blead-from-the-ears.
From NetBSD via Antoine Jacoutot <ajacoutot at lphp.org> Ok millert@ mickey@ deraadt@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/emuxki.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 641c1e65346..f7d544b6a81 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emuxki.c,v 1.18 2004/04/14 21:36:41 mickey Exp $ */
+/* $OpenBSD: emuxki.c,v 1.19 2004/09/02 02:09:09 marco Exp $ */
/* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */
/*-
@@ -1610,7 +1610,7 @@ emuxki_resched_timer(struct emuxki_softc *sc)
if (timerate & ~EMU_TIMER_RATE_MASK)
timerate = 0;
- bus_space_write_4(sc->sc_iot, sc->sc_ioh, EMU_TIMER, timerate);
+ bus_space_write_2(sc->sc_iot, sc->sc_ioh, EMU_TIMER, timerate);
if (!active && (sc->timerstate & EMU_TIMER_STATE_ENABLED)) {
bus_space_write_4(sc->sc_iot, sc->sc_ioh, EMU_INTE,
bus_space_read_4(sc->sc_iot, sc->sc_ioh, EMU_INTE) &