Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / sound / usb / quirks-table.h

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 99de0610039515d34f80933443c02bb46ed3ccd5..1a1e2e4df35e5809e7f7d81b405ca6dddf2f4311 100644 (file)
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -3191,25 +3191,19 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
 {
        /*
         * ZOOM R16/24 in audio interface mode.
-        * Mixer descriptors are garbage, further quirks will be needed
-        * to make any of it functional, thus disabled for now.
-        * Playback stream appears to start and run fine but no sound
-        * is produced, so also disabled for now.
+        * Playback requires an extra four byte LE length indicator
+        * at the start of each isochronous packet. This quirk is
+        * enabled in create_standard_audio_quirk().
         */
        USB_DEVICE(0x1686, 0x00dd),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                .ifnum = QUIRK_ANY_INTERFACE,
                .type = QUIRK_COMPOSITE,
                .data = (const struct snd_usb_audio_quirk[]) {
-                       {
-                               /* Mixer */
-                               .ifnum = 0,
-                               .type = QUIRK_IGNORE_INTERFACE,
-                       },
                        {
                                /* Playback  */
                                .ifnum = 1,
-                               .type = QUIRK_IGNORE_INTERFACE,
+                               .type = QUIRK_AUDIO_STANDARD_INTERFACE,
                        },
                        {
                                /* Capture */