Merge branch 'perf/urgent' into perf/core

[karo-tx-linux.git] / sound / usb / mixer.c

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 4f40ba82316316fdad18839c1bc906af2a2af66f..fe56c9da38e9e6c78cdd6706f09e9639d8a502ab 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1267,6 +1267,13 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
                /* disable non-functional volume control */
                master_bits &= ~UAC_CONTROL_BIT(UAC_FU_VOLUME);
                break;
+       case USB_ID(0x1130, 0xf211):
+               snd_printk(KERN_INFO
+                          "usbmixer: volume control quirk for Tenx TP6911 Audio Headset\n");
+               /* disable non-functional volume control */
+               channels = 0;
+               break;
+
        }
        if (channels > 0)
                first_ch_bits = snd_usb_combine_bytes(bmaControls + csize, csize);