mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

ALSA: usb-audio: fix Corsair Virtuoso mixer label collision

Browse source 
The Corsair Virtuoso RGB Wireless is a USB headset with a mic and a
sidetone feature. Label its mixer appropriately instead of all
"Headset", so that applications such as Pulseaudio don't just move
the sidetone control when they intend the main Headset control.

Signed-off-by: Chris Boyle <chris@boyle.name>
Link: https://lore.kernel.org/r/20191227094053.GA12167@nova.chris.boyle.name
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Chris Boyle 2019-12-27 10:40:53 +01:00 committed by Takashi Iwai
parent a103a39899
commit 7d8d3c377c
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sound/usb/mixer_maps.c
View file

@ -349,6 +349,16 @@ static const struct usbmix_name_map dell_alc4020_map[] = {
{ 0 } { 0 }
}; };
/*
* Corsair Virtuoso calls everything "Headset" without this, leading to
* applications moving the sidetone control instead of the main one.
*/
static const struct usbmix_name_map corsair_virtuoso_map[] = {
{ 3, "Mic Capture" },
{ 6, "Sidetone Playback" },
{ 0 }
};
/* /*
* Control map entries * Control map entries
*/ */
@ -468,6 +478,16 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.id = USB_ID(0x05a7, 0x1020), .id = USB_ID(0x05a7, 0x1020),
.map = bose_companion5_map, .map = bose_companion5_map,
}, },
{
/* Corsair Virtuoso (wired mode) */
.id = USB_ID(0x1b1c, 0x0a41),
.map = corsair_virtuoso_map,
},
{
/* Corsair Virtuoso (wireless mode) */
.id = USB_ID(0x1b1c, 0x0a42),
.map = corsair_virtuoso_map,
},
{ 0 } /* terminator */ { 0 } /* terminator */
}; };