aboutsummaryrefslogtreecommitdiff
path: root/sound/usb/mixer_quirks.c
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2011-05-18 11:28:41 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-18 11:44:42 +0200
commit759e890f5c25ef087d866b330261e793b03ef7a4 (patch)
treedd3a640e17671edd60647e683ae82aba148a8662 /sound/usb/mixer_quirks.c
parentee95cb6121dae17bc199cd566503dff1b2dd243b (diff)
downloadlinux-linaro-759e890f5c25ef087d866b330261e793b03ef7a4.tar.gz
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.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 4a7ad7ed62f..73dcc8256bc 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,
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,