projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
acf91b8
)
ALSA: usb-audio: scarlett2: Fix 6i6 Gen 2 line out descriptions
author
Geoffrey D. Bennett
<g@b4.vu>
Mon, 21 Jun 2021 18:09:18 +0000
(
03:39
+0930)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 22 Jun 2021 19:35:59 +0000
(21:35 +0200)
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>
sound/usb/mixer_scarlett_gen2.c
patch
|
blob
|
history
diff --git
a/sound/usb/mixer_scarlett_gen2.c
b/sound/usb/mixer_scarlett_gen2.c
index
ed89e28
..
0b1967d
100644
(file)
--- 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 = {