From aca2249d5421f18f35ced4c6f124f2244fd8a72d Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Wed, 20 Apr 2011 19:41:08 +0000 Subject: [PATCH] Only set the sample rate if the USB audio channel reports that it supports the frequency control request. MFC after: 7 days Approved by: thompsa (mentor) --- sys/dev/sound/usb/uaudio.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index de75aee3def2..79bfc136ff24 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1360,11 +1360,10 @@ uaudio_chan_init(struct uaudio_softc *sc, struct snd_dbuf *b, sc->sc_mixer_iface_index); /* - * If just one sampling rate is supported, - * no need to call "uaudio_set_speed()". - * Roland SD-90 freezes by a SAMPLING_FREQ_CONTROL request. + * Only set the sample rate if the channel reports that it + * supports the frequency control. */ - if (ch->p_asf1d->bSamFreqType != 1) { + if (ch->p_sed->bmAttributes & UA_SED_FREQ_CONTROL) { if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) { /* * If the endpoint is adaptive setting the speed may