Commit 7d8d3c37 authored by Chris Boyle's avatar Chris Boyle Committed by Takashi Iwai
Browse files

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: default avatarChris Boyle <chris@boyle.name>
Link: https://lore.kernel.org/r/20191227094053.GA12167@nova.chris.boyle.name


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a103a398

sound/usb/mixer_maps.c

+20 −0
Original line number Diff line number Diff line
@@ -349,6 +349,16 @@ static const struct usbmix_name_map dell_alc4020_map[] = { 
	{ 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

 */
@@ -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 */

};