Commit 6bc7ea65 authored Jun 22, 2021 by Geoffrey D. Bennett Committed by Greg Kroah-Hartman Jul 20, 2021

ALSA: usb-audio: scarlett2: Fix 6i6 Gen 2 line out descriptions



[ Upstream commit c712c6c0ff2d60478582e337185bcdd520a7dc2e ]

There are two headphone outputs, and they map to the four analogue
outputs.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/205e5e5348f08ded0cc4da5446f604d4b91db5bf.1624294591.git.g@b4.vu


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7929bcf1

sound/usb/mixer_scarlett_gen2.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -254,10 +254,10 @@ static const struct scarlett2_device_info s6i6_gen2_info = {
		.pad_input_count = 2,

		.line_out_descrs = {
		"Monitor L",
		"Monitor R",
		"Headphones L",
		"Headphones R",
		"Headphones 1 L",
		"Headphones 1 R",
		"Headphones 2 L",
		"Headphones 2 R",
		},

		.ports = {