ALSA: usb-audio: Add capture support for Saffire 6 (USB 1.1) (470757f5) · Commits · 戴 / test

Capture and playback endpoints on Saffire 6 (USB 1.1) resides on the same interface. This was not supported by the composite quirk back in the day when initial support for this device was added, thus only playback was enabled until now. Fixes: ("ALSA: usb-audio: Add support for Focusrite Saffire 6 USB") Signed-off-by:

Alexander Tsoy <alexander@tsoy.me> Cc: <stable.vger.kernel.org> Link: https://lore.kernel.org/r/20200815002103.29247-1-alexander@tsoy.me Signed-off-by:

Takashi Iwai <tiwai@suse.de>

sound/usb/quirks-table.h

+30 −0

Original line number	Diff line number	Diff line
		@@ -2678,6 +2678,10 @@ YAMAHA_DEVICE(0x7010, "UB99"),
		.ifnum = QUIRK_ANY_INTERFACE,
		.type = QUIRK_COMPOSITE,
		.data = (const struct snd_usb_audio_quirk[]) {
		{
		.ifnum = 0,
		.type = QUIRK_AUDIO_STANDARD_MIXER,
		},
		{
		.ifnum = 0,
		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
		@@ -2690,6 +2694,32 @@ YAMAHA_DEVICE(0x7010, "UB99"),
		.attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
		.endpoint = 0x01,
		.ep_attr = USB_ENDPOINT_XFER_ISOC,
		.datainterval = 1,
		.maxpacksize = 0x024c,
		.rates = SNDRV_PCM_RATE_44100 \|
		SNDRV_PCM_RATE_48000,
		.rate_min = 44100,
		.rate_max = 48000,
		.nr_rates = 2,
		.rate_table = (unsigned int[]) {
		44100, 48000
		}
		}
		},
		{
		.ifnum = 0,
		.type = QUIRK_AUDIO_FIXED_ENDPOINT,
		.data = &(const struct audioformat) {
		.formats = SNDRV_PCM_FMTBIT_S24_3LE,
		.channels = 2,
		.iface = 0,
		.altsetting = 1,
		.altset_idx = 1,
		.attributes = 0,
		.endpoint = 0x82,
		.ep_attr = USB_ENDPOINT_XFER_ISOC,
		.datainterval = 1,
		.maxpacksize = 0x0126,
		.rates = SNDRV_PCM_RATE_44100 \|
		SNDRV_PCM_RATE_48000,
		.rate_min = 44100,

Admin message