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>

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 4a7ad7ed62f7691bf175345467a40a15ad3e77f8..73dcc8256bc0abbeeb2ebed24957e5ae7912b31d 100644 (file)
--- 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,

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 54e18c181a128dff956147ee946a39e0279278ff..5c1a176c426dff0ad9ecccf8e906b3ca48acff4f 100644 (file)
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -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,

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 2452edd2f1412ad8480a62b622dac3201bf28806..c1a5d7d4580b1fae486e30e9871ca96344bfd3b2 100644 (file)
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -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);