[src/trunk]: src/sys/arch/hppa/gsc Fix my mistakes in rev1.6.

[isaki <isaki%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/216fc0d25001
branches:  trunk
changeset: 951491:216fc0d25001
user:      isaki <isaki%NetBSD.org@localhost>
date:      Thu Feb 04 15:06:11 2021 +0000

description:
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:

 sys/arch/hppa/gsc/harmony.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r a5eee9429c85 -r 216fc0d25001 sys/arch/hppa/gsc/harmony.c
--- a/sys/arch/hppa/gsc/harmony.c       Thu Feb 04 08:51:42 2021 +0000
+++ b/sys/arch/hppa/gsc/harmony.c       Thu Feb 04 15:06:11 2021 +0000
@@ -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 @@
 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 @@
 
        /* 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;