Date: Thu, 28 Apr 2011 06:51:48 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r221149 - stable/8/sys/dev/sound/usb Message-ID: <201104280651.p3S6pm8g009571@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Thu Apr 28 06:51:47 2011 New Revision: 221149 URL: http://svn.freebsd.org/changeset/base/221149 Log: MFC r220900. Only set the sample rate if the USB audio channel reports that it supports the frequency control request. Approved by: thompsa Modified: stable/8/sys/dev/sound/usb/uaudio.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/sound/usb/uaudio.c ============================================================================== --- stable/8/sys/dev/sound/usb/uaudio.c Thu Apr 28 05:48:32 2011 (r221148) +++ stable/8/sys/dev/sound/usb/uaudio.c Thu Apr 28 06:51:47 2011 (r221149) @@ -1364,11 +1364,10 @@ uaudio_chan_init(struct uaudio_softc *sc usbd_set_parent_iface(sc->sc_udev, iface_index, 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104280651.p3S6pm8g009571>