Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 9 Nov 2021 21:13:00 GMT
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 11f09b17fe2c - main - snd_uaudio(4): Fix string index computations for iFeature.
Message-ID:  <202111092113.1A9LD0jF054236@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
The branch main has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=11f09b17fe2cf0b5489601aee548a06486f0b749

commit 11f09b17fe2cf0b5489601aee548a06486f0b749
Author:     Hans Petter Selasky <hselasky@FreeBSD.org>
AuthorDate: 2021-11-09 21:07:36 +0000
Commit:     Hans Petter Selasky <hselasky@FreeBSD.org>
CommitDate: 2021-11-09 21:11:25 +0000

    snd_uaudio(4): Fix string index computations for iFeature.
    
    This allows the iFeature strings to be properly read by the snd_uaudio(4) driver,
    when parsing the audio feature unit descriptors.
    
    Submitted by:   Zhichao1.Li@dell.com
    MFC after:      1 week
    Sponsored by:   NVIDIA Networking
---
 sys/dev/sound/usb/uaudio.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 3a7d4189b9ef..bc5b0d04c020 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -3648,18 +3648,18 @@ uaudio_mixer_add_feature(struct uaudio_softc *sc,
 		cmask |= uaudio_mixer_feature_get_bmaControls(d, chan);
 	}
 
-	if (nchan > MIX_MAX_CHAN)
-		nchan = MIX_MAX_CHAN;
-
 	MIX(sc).wIndex = MAKE_WORD(d->bUnitId, sc->sc_mixer_iface_no);
 
-	i = d->bmaControls[d->bControlSize];
+	i = d->bmaControls[nchan * d->bControlSize];
 	if (i == 0 ||
 	    usbd_req_get_string_any(sc->sc_udev, NULL,
 	    MIX(sc).desc, sizeof(MIX(sc).desc), i) != 0) {
 		MIX(sc).desc[0] = 0;
 	}
 
+	if (nchan > MIX_MAX_CHAN)
+		nchan = MIX_MAX_CHAN;
+
 	for (ctl = 1; ctl <= LOUDNESS_CONTROL; ctl++) {
 		fumask = FU_MASK(ctl);
 
@@ -3782,9 +3782,6 @@ uaudio20_mixer_add_feature(struct uaudio_softc *sc,
 	for (chan = 1; chan < nchan; chan++)
 		cmask |= UGETDW(d->bmaControls[chan]);
 
-	if (nchan > MIX_MAX_CHAN)
-		nchan = MIX_MAX_CHAN;
-
 	MIX(sc).wIndex = MAKE_WORD(d->bUnitId, sc->sc_mixer_iface_no);
 
 	i = d->bmaControls[nchan][0];
@@ -3794,6 +3791,9 @@ uaudio20_mixer_add_feature(struct uaudio_softc *sc,
 		MIX(sc).desc[0] = 0;
 	}
 
+	if (nchan > MIX_MAX_CHAN)
+		nchan = MIX_MAX_CHAN;
+
 	for (ctl = 3; ctl != 0; ctl <<= 2) {
 		mixernumber = uaudio20_mixer_determine_class(&iot[id]);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111092113.1A9LD0jF054236>