From: Geoffrey D. Bennett Date: Mon, 21 Jun 2021 18:09:18 +0000 (+0930) Subject: ALSA: usb-audio: scarlett2: Fix 6i6 Gen 2 line out descriptions X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c712c6c0ff2d60478582e337185bcdd520a7dc2e;p=linux.git ALSA: usb-audio: scarlett2: Fix 6i6 Gen 2 line out descriptions There are two headphone outputs, and they map to the four analogue outputs. Signed-off-by: Geoffrey D. Bennett Link: https://lore.kernel.org/r/205e5e5348f08ded0cc4da5446f604d4b91db5bf.1624294591.git.g@b4.vu Signed-off-by: Takashi Iwai --- diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c index ed89e28548c83..0b1967d934861 100644 --- a/sound/usb/mixer_scarlett_gen2.c +++ b/sound/usb/mixer_scarlett_gen2.c @@ -263,10 +263,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 = {