diff options
| author | Chris J Arges <chris.j.arges@canonical.com> | 2014-11-12 12:06:59 -0600 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-11-13 07:31:41 +0100 |
| commit | ef9566a3a1c0e46dadfa6c722e8a685ac0cea081 (patch) | |
| tree | a508eb5d17af2cec3ae3b1a3cf5f9289188cf44b /sound | |
| parent | c63fcb9b67777b906c4515a868afbd96bae4e799 (diff) | |
| download | lwn-ef9566a3a1c0e46dadfa6c722e8a685ac0cea081.tar.gz lwn-ef9566a3a1c0e46dadfa6c722e8a685ac0cea081.zip | |
Revert "ALSA: usb-audio: Add quirk for Focusrite Scarlett
This reverts commit 1762a59d8e8b5e99f6f4a0f292b40f3cacb108ba.
This quirk is not needed because support for the Scarlett mixers will be added.
Signed-off-by: Chris J Arges <chris.j.arges@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/quirks-table.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 13f44fd0e930..013cba8ee8a6 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2667,57 +2667,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), .type = QUIRK_MIDI_NOVATION } }, -{ - /* - * Focusrite Scarlett 18i6 - * - * Avoid mixer creation, which otherwise fails because some of - * the interface descriptor subtypes for interface 0 are - * unknown. That should be fixed or worked-around but this at - * least allows the device to be used successfully with a DAW - * and an external mixer. See comments below about other - * ignored interfaces. - */ - USB_DEVICE(0x1235, 0x8004), - .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { - .vendor_name = "Focusrite", - .product_name = "Scarlett 18i6", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_COMPOSITE, - .data = & (const struct snd_usb_audio_quirk[]) { - { - /* InterfaceSubClass 1 (Control Device) */ - .ifnum = 0, - .type = QUIRK_IGNORE_INTERFACE - }, - { - .ifnum = 1, - .type = QUIRK_AUDIO_STANDARD_INTERFACE - }, - { - .ifnum = 2, - .type = QUIRK_AUDIO_STANDARD_INTERFACE - }, - { - /* InterfaceSubClass 1 (Control Device) */ - .ifnum = 3, - .type = QUIRK_IGNORE_INTERFACE - }, - { - .ifnum = 4, - .type = QUIRK_MIDI_STANDARD_INTERFACE - }, - { - /* InterfaceSubClass 1 (Device Firmware Update) */ - .ifnum = 5, - .type = QUIRK_IGNORE_INTERFACE - }, - { - .ifnum = -1 - } - } - } -}, /* Access Music devices */ { |