diff options
| author | Chris Boyle <chris@boyle.name> | 2019-12-27 10:40:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-28 14:17:57 +0100 |
| commit | 7d8d3c377cc9731c3924f807c7769177ca3f0865 (patch) | |
| tree | 8b5b8f66cb294b68e78abe42e5adb1311d18522e /sound/usb | |
| parent | a103a3989993859091a26936b9337a8e09330fc3 (diff) | |
| download | linux-7d8d3c377cc9731c3924f807c7769177ca3f0865.tar.bz2 | |
ALSA: usb-audio: fix Corsair Virtuoso mixer label collision
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>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer_maps.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c index 73baf398c84a..d094934ae6c5 100644 --- a/sound/usb/mixer_maps.c +++ b/sound/usb/mixer_maps.c @@ -350,6 +350,16 @@ static const struct usbmix_name_map dell_alc4020_map[] = { }; /* + * 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 */ @@ -468,6 +478,16 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .id = USB_ID(0x05a7, 0x1020), .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 */ }; |