Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 759e890f authored by Daniel Mack's avatar Daniel Mack Committed by Takashi Iwai
Browse files

ALSA: usb-audio: remove invalid extra mixers for Komplete Audio 6 



This was a flaw in the reading of the spec tables - Native Instrument's
"Komplete Audio 6" device has no such extra controls.

This patch also fixes the device name in two comments.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ee95cb61

sound/usb/mixer_quirks.c

+0 −17
Original line number Diff line number Diff line
@@ -398,17 +398,6 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol, 
	return 0;

}



static struct snd_kcontrol_new snd_nativeinstruments_ak6_mixers[] = {

	{

		.name = "Direct Monitor Channel 1+2",

		.private_value = _MAKE_NI_CONTROL(0x03, 0x03),

	},

	{

		.name = "Direct Monitor Channel 3+4",

		.private_value = _MAKE_NI_CONTROL(0x03, 0x05),

	},

};



static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = {

	{

		.name = "Direct Thru Channel A",
@@ -537,12 +526,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) 
		err = snd_xonar_u1_controls_create(mixer);

		break;



	case USB_ID(0x17cc, 0x1001): /* Audio Kontrol 6 */

		err = snd_nativeinstruments_create_mixer(mixer,

				snd_nativeinstruments_ak6_mixers,

				ARRAY_SIZE(snd_nativeinstruments_ak6_mixers));

		break;



	case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */

		err = snd_nativeinstruments_create_mixer(mixer,

				snd_nativeinstruments_ta6_mixers,

sound/usb/quirks-table.h

+1 −1
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), 


/* Native Instruments MK2 series */

{

	/* Audio Kontrol 6 */

	/* Komplete Audio 6 */

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE,

	.idVendor = 0x17cc,

	.idProduct = 0x1000,

sound/usb/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, 
		/* Access Music VirusTI Desktop */

		return snd_usb_accessmusic_boot_quirk(dev);



	case USB_ID(0x17cc, 0x1000): /* Audio Kontrol 6 */

	case USB_ID(0x17cc, 0x1000): /* Komplete Audio 6 */

	case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */

	case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */

		return snd_usb_nativeinstruments_boot_quirk(dev);