| From 16cfef23ab7f282989beaa1750fe9d0871508ad4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 22 Jun 2021 03:39:18 +0930 |
| Subject: ALSA: usb-audio: scarlett2: Fix 6i6 Gen 2 line out descriptions |
| |
| From: Geoffrey D. Bennett <g@b4.vu> |
| |
| [ 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> |
| --- |
| sound/usb/mixer_scarlett_gen2.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c |
| index b92319928ddd..38f4a2a37e0f 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 = { |
| -- |
| 2.30.2 |
| |
