diff options
| author | isaki <isaki@NetBSD.org> | 2021-02-04 15:06:11 +0000 |
|---|---|---|
| committer | isaki <isaki@NetBSD.org> | 2021-02-04 15:06:11 +0000 |
| commit | b96dc5cc35e0aba0de047a958abe2255a14b424d (patch) | |
| tree | 18fb250ce46e7c923afb469d544edf644c9de6b7 /sys | |
| parent | 287443ce70af506c33c35fec00e1bd81a774f596 (diff) | |
Fix my mistakes in rev1.6.
- I had to merge the channel bit and the speed bits.
Reported by macallan@.
- I also fix my indent, while I'm here.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/hppa/gsc/harmony.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c index e4c88abac57..f890d770dc6 100644 --- a/sys/arch/hppa/gsc/harmony.c +++ b/sys/arch/hppa/gsc/harmony.c @@ -1,4 +1,4 @@ -/* $NetBSD: harmony.c,v 1.8 2021/02/03 15:13:49 isaki Exp $ */ +/* $NetBSD: harmony.c,v 1.9 2021/02/04 15:06:11 isaki Exp $ */ /* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */ @@ -437,7 +437,7 @@ harmony_query_format(void *vsc, audio_format_query_t *afp) int harmony_set_format(void *vsc, int setmode, const audio_params_t *play, const audio_params_t *rec, - audio_filter_reg_t *pfil, audio_filter_reg_t *rfil) + audio_filter_reg_t *pfil, audio_filter_reg_t *rfil) { struct harmony_softc *sc; uint32_t bits; @@ -467,7 +467,8 @@ harmony_set_format(void *vsc, int setmode, /* XXX modify harmony_speed_bits() not to rewrite rate */ rate = play->sample_rate; - sc->sc_cntlbits |= harmony_speed_bits(sc, &rate); + bits |= harmony_speed_bits(sc, &rate); + sc->sc_cntlbits = bits; sc->sc_need_commit = 1; return 0; |
