Author: hselasky
Date: Wed Apr 20 19:41:08 2011
New Revision: 220900
URL: http://svn.freebsd.org/changeset/base/220900

Log:
  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)

Modified:
  head/sys/dev/sound/usb/uaudio.c

Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c     Wed Apr 20 18:49:12 2011        
(r220899)
+++ head/sys/dev/sound/usb/uaudio.c     Wed Apr 20 19:41:08 2011        
(r220900)
@@ -1360,11 +1360,10 @@ uaudio_chan_init(struct uaudio_softc *sc
            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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to