Skip to content

Commit 8780f56

Browse files
geoffreybennetttiwai
authored andcommitted
ALSA: usb-audio: Exclude Scarlett 2i2 1st Gen from SKIP_IFACE_SETUP
The Focusrite Scarlett 2i2 1st Gen (1235:8006) produces distorted/silent audio when QUIRK_FLAG_SKIP_IFACE_SETUP is active, as that flag causes the feedback format to be detected as 17.15 instead of 16.16. Add a DEVICE_FLG entry for this device before the Focusrite VENDOR_FLG entry so that it gets no quirk flags, overriding the vendor-wide SKIP_IFACE_SETUP. This device doesn't have the internal mixer, Air, or Safe modes that the quirk was designed to protect. Fixes: 38c3220 ("ALSA: usb-audio: Add QUIRK_FLAG_SKIP_IFACE_SETUP") Reported-by: pairomaniac [geoffreybennett/linux-fcp#54] Tested-by: pairomaniac [geoffreybennett/linux-fcp#54] Signed-off-by: Geoffrey D. Bennett <g@b4.vu> Link: https://patch.msgid.link/abmsTjKmQMKbhYtK@m.b4.vu Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent bb120ad commit 8780f56

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

sound/usb/quirks.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2429,6 +2429,7 @@ static const struct usb_audio_quirk_flags_table quirk_flags_table[] = {
24292429
QUIRK_FLAG_CTL_MSG_DELAY | QUIRK_FLAG_IFACE_DELAY),
24302430
VENDOR_FLG(0x07fd, /* MOTU */
24312431
QUIRK_FLAG_VALIDATE_RATES),
2432+
DEVICE_FLG(0x1235, 0x8006, 0), /* Focusrite Scarlett 2i2 1st Gen */
24322433
VENDOR_FLG(0x1235, /* Focusrite Novation */
24332434
QUIRK_FLAG_SKIP_CLOCK_SELECTOR |
24342435
QUIRK_FLAG_SKIP_IFACE_SETUP),

0 commit comments

Comments
 (0)