| Message ID | 20240128132338.819273-1-alexander@tsoy.me (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c0787fcff88bce36d21e5b726bdeab694baba6a5 |
| Headers | show |
| Series | Revert "ALSA: usb-audio: Skip setting clock selector for single connections" | expand |
On Sun, 28 Jan 2024 14:23:38 +0100, Alexander Tsoy wrote: > > 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> Thanks, applied. Takashi
diff --git a/sound/usb/clock.c b/sound/usb/clock.c index 7b259641adb5..a8204c6d6fac 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -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)
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> --- sound/usb/clock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)