aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorGeoffrey D. Bennett <g@b4.vu>2021-06-22 03:39:18 +0930
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-20 16:05:45 +0200
commit9ada4baae6393bcb3740a5b4b2d7bb209854b8e5 (patch)
treebea91cd3077635f2fc8821ef52b0ae5826588389 /sound/usb
parentfb7c8bfa2e3ca7dfc966480659961c6266336b2f (diff)
downloadkernel_replicant_linux-9ada4baae6393bcb3740a5b4b2d7bb209854b8e5.tar.gz
kernel_replicant_linux-9ada4baae6393bcb3740a5b4b2d7bb209854b8e5.tar.bz2
kernel_replicant_linux-9ada4baae6393bcb3740a5b4b2d7bb209854b8e5.zip
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>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/mixer_scarlett_gen2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c
index 1802aee390c7..1b7c7b754c38 100644
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett_gen2.c
@@ -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 = {