diff options
author | Daniel Mack <zonque@gmail.com> | 2011-05-18 05:28:41 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-18 05:44:42 -0400 |
commit | 759e890f5c25ef087d866b330261e793b03ef7a4 (patch) | |
tree | dd3a640e17671edd60647e683ae82aba148a8662 /sound/usb/mixer_quirks.c | |
parent | ee95cb6121dae17bc199cd566503dff1b2dd243b (diff) |
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: Daniel Mack <zonque@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer_quirks.c')
-rw-r--r-- | sound/usb/mixer_quirks.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 4a7ad7ed62f7..73dcc8256bc0 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c | |||
@@ -398,17 +398,6 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol, | |||
398 | return 0; | 398 | return 0; |
399 | } | 399 | } |
400 | 400 | ||
401 | static struct snd_kcontrol_new snd_nativeinstruments_ak6_mixers[] = { | ||
402 | { | ||
403 | .name = "Direct Monitor Channel 1+2", | ||
404 | .private_value = _MAKE_NI_CONTROL(0x03, 0x03), | ||
405 | }, | ||
406 | { | ||
407 | .name = "Direct Monitor Channel 3+4", | ||
408 | .private_value = _MAKE_NI_CONTROL(0x03, 0x05), | ||
409 | }, | ||
410 | }; | ||
411 | |||
412 | static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = { | 401 | static struct snd_kcontrol_new snd_nativeinstruments_ta6_mixers[] = { |
413 | { | 402 | { |
414 | .name = "Direct Thru Channel A", | 403 | .name = "Direct Thru Channel A", |
@@ -537,12 +526,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) | |||
537 | err = snd_xonar_u1_controls_create(mixer); | 526 | err = snd_xonar_u1_controls_create(mixer); |
538 | break; | 527 | break; |
539 | 528 | ||
540 | case USB_ID(0x17cc, 0x1001): /* Audio Kontrol 6 */ | ||
541 | err = snd_nativeinstruments_create_mixer(mixer, | ||
542 | snd_nativeinstruments_ak6_mixers, | ||
543 | ARRAY_SIZE(snd_nativeinstruments_ak6_mixers)); | ||
544 | break; | ||
545 | |||
546 | case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */ | 529 | case USB_ID(0x17cc, 0x1011): /* Traktor Audio 6 */ |
547 | err = snd_nativeinstruments_create_mixer(mixer, | 530 | err = snd_nativeinstruments_create_mixer(mixer, |
548 | snd_nativeinstruments_ta6_mixers, | 531 | snd_nativeinstruments_ta6_mixers, |