mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-18 16:44:33 +00:00
ALSA: usb-audio: Explicitly set up the clock selector
commitd2e8f64125
upstream. In the current code, we have some assumption that the audio clock selector has been set up implicitly and don't want to touch it unless it's really needed for the fallback autoclock setup. This works for most devices but some seem having a problem. Partially this was covered for the devices with a single connector at the initialization phase (commit086b957cc1
"ALSA: usb-audio: Skip the clock selector inquiry for single connections"), but also there are cases where the wrong clock set up is kept silently. The latter seems to be the cause of the noises on Behringer devices. In this patch, we explicitly set up the audio clock selector whenever the appropriate node is found. Reported-by: Geraldo Nascimento <geraldogabriel@gmail.com> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=199327 Link: https://lore.kernel.org/r/CAEsQvcvF7LnO8PxyyCxuRCx=7jNeSCvFAd-+dE0g_rd1rOxxdw@mail.gmail.com Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20210413084152.32325-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9d7923f093
commit
000764fce4
1 changed files with 14 additions and 4 deletions
|
@ -273,7 +273,7 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
|
|||
|
||||
selector = snd_usb_find_clock_selector(chip->ctrl_intf, entity_id);
|
||||
if (selector) {
|
||||
int ret, i, cur;
|
||||
int ret, i, cur, err;
|
||||
|
||||
/* the entity ID we are looking for is a selector.
|
||||
* find out what it currently selects */
|
||||
|
@ -295,13 +295,17 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
|
|||
ret = __uac_clock_find_source(chip, fmt,
|
||||
selector->baCSourceID[ret - 1],
|
||||
visited, validate);
|
||||
if (ret > 0) {
|
||||
err = uac_clock_selector_set_val(chip, entity_id, cur);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (!validate || ret > 0 || !chip->autoclock)
|
||||
return ret;
|
||||
|
||||
/* The current clock source is invalid, try others. */
|
||||
for (i = 1; i <= selector->bNrInPins; i++) {
|
||||
int err;
|
||||
|
||||
if (i == cur)
|
||||
continue;
|
||||
|
||||
|
@ -367,7 +371,7 @@ static int __uac3_clock_find_source(struct snd_usb_audio *chip,
|
|||
|
||||
selector = snd_usb_find_clock_selector_v3(chip->ctrl_intf, entity_id);
|
||||
if (selector) {
|
||||
int ret, i, cur;
|
||||
int ret, i, cur, err;
|
||||
|
||||
/* the entity ID we are looking for is a selector.
|
||||
* find out what it currently selects */
|
||||
|
@ -389,6 +393,12 @@ static int __uac3_clock_find_source(struct snd_usb_audio *chip,
|
|||
ret = __uac3_clock_find_source(chip, fmt,
|
||||
selector->baCSourceID[ret - 1],
|
||||
visited, validate);
|
||||
if (ret > 0) {
|
||||
err = uac_clock_selector_set_val(chip, entity_id, cur);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
if (!validate || ret > 0 || !chip->autoclock)
|
||||
return ret;
|
||||
|
||||
|
|
Loading…
Reference in a new issue