Revert "ALSA: usb-audio: Skip setting clock selector for single connections"
authorAlexander Tsoy <alexander@tsoy.me>
Sun, 28 Jan 2024 13:23:38 +0000 (16:23 +0300)
committerTakashi Iwai <tiwai@suse.de>
Mon, 29 Jan 2024 08:07:57 +0000 (09:07 +0100)
This reverts commit 67794f882adca00d043899ac248bc002751da9f6.

We need to explicitly set up the clock selector to workaround a problem
with the Behringer mixers. This was originally done in d2e8f641257d
("ALSA: usb-audio: Explicitly set up the clock selector")

The problem with MOTU M Series mentioned in commit message was fixed in
a different way by checking control capabilities of clock selectors.

Signed-off-by: Alexander Tsoy <alexander@tsoy.me>
Link: https://lore.kernel.org/r/20240128132338.819273-1-alexander@tsoy.me
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/clock.c

index 7b25964..a8204c6 100644 (file)
@@ -344,7 +344,7 @@ static int __uac_clock_find_source(struct snd_usb_audio *chip,
                if (ret > 0) {
                        /* Skip setting clock selector again for some devices */
                        if (chip->quirk_flags & QUIRK_FLAG_SKIP_CLOCK_SELECTOR ||
-                           pins == 1 || !writeable)
+                           !writeable)
                                return ret;
                        err = uac_clock_selector_set_val(chip, entity_id, cur);
                        if (err < 0)