Commit ef9566a3 authored by Chris J Arges's avatar Chris J Arges Committed by Takashi Iwai
Browse files

Revert "ALSA: usb-audio: Add quirk for Focusrite Scarlett 



This reverts commit 1762a59d.

This quirk is not needed because support for the Scarlett mixers will be added.

Signed-off-by: default avatarChris J Arges <chris.j.arges@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c63fcb9b

sound/usb/quirks-table.h

+0 −51
Original line number Diff line number Diff line
@@ -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 */

{