upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 08:43:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

snd_uaudio(4): Fix sample rate selection after 42fdcd9fd9.

Browse source 
The sample rate selection of snd_uaudio(4) at runtime was implicitly
relying on a specific order in the device config list. In case a default
was set through the hw.usb.uaudio.default_rate sysctl tunable, commit
42fdcd9fd9 removed a duplicate sample rate entry from that list, which
inadvertently broke sample rate selection at runtime. Implement sample
rate selection in a way that works for any order in the device config
list.

Reported by:	Lexi Winter <lexi@le-fay.org>
MFC after:	1 week
Reviewed by:	christos
Differential Revision:	https://reviews.freebsd.org/D44051
This commit is contained in:
Florian Walpen 2024-02-27 00:27:47 +01:00 committed by Christos Margiolis
parent bc4c7e78f8
commit a9341f0f0a
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sys/dev/sound/usb/uaudio.c
View file

@ -2768,20 +2768,19 @@ int
uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed)
{
struct uaudio_softc *sc;
uint8_t x;
uint8_t x, y;
sc = ch->priv_sc;
for (x = 0; x < ch->num_alt; x++) {
if (ch->usb_alt[x].sample_rate < speed) {
/* sample rate is too low */
break;
}
for (x = 0, y = 1; y < ch->num_alt; y++) {
/* prefer sample rate closer to and greater than requested */
if ((ch->usb_alt[x].sample_rate < speed &&
ch->usb_alt[x].sample_rate < ch->usb_alt[y].sample_rate) ||
(speed <= ch->usb_alt[y].sample_rate &&
ch->usb_alt[y].sample_rate < ch->usb_alt[x].sample_rate))
x = y;
}
if (x != 0)
x--;
usb_proc_explore_lock(sc->sc_udev);
ch->set_alt = x;
usb_proc_explore_unlock(sc->sc_udev);