1 files changed, 35 insertions, 15 deletions

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index ab23869c01bb..4f40ba823163 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -486,7 +486,7 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel,
 /*
  * TLV callback for mixer volume controls
  */
-static int mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
                          unsigned int size, unsigned int __user *_tlv)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
@@ -770,6 +770,26 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
                                   struct snd_kcontrol *kctl)
 {
         switch (cval->mixer->chip->usb_id) {
+        case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */
+        case USB_ID(0x0763, 0x2080): /* M-Audio Fast Track Ultra */
+                if (strcmp(kctl->id.name, "Effect Duration") == 0) {
+                        snd_printk(KERN_INFO
+                                "usb-audio: set quirk for FTU Effect Duration\n");
+                        cval->min = 0x0000;
+                        cval->max = 0x7f00;
+                        cval->res = 0x0100;
+                        break;
+                }
+                if (strcmp(kctl->id.name, "Effect Volume") == 0 ||
+                    strcmp(kctl->id.name, "Effect Feedback Volume") == 0) {
+                        snd_printk(KERN_INFO
+                                "usb-audio: set quirks for FTU Effect Feedback/Volume\n");
+                        cval->min = 0x00;
+                        cval->max = 0x7f;
+                        break;
+                }
+                break;
+
         case USB_ID(0x0471, 0x0101):
         case USB_ID(0x0471, 0x0104):
         case USB_ID(0x0471, 0x0105):
@@ -1121,9 +1141,6 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                 len = snd_usb_copy_string_desc(state, nameid,
                                 kctl->id.name, sizeof(kctl->id.name));
 
-        /* get min/max values */
-        get_min_max_with_quirks(cval, 0, kctl);
-
         switch (control) {
         case UAC_FU_MUTE:
         case UAC_FU_VOLUME:
@@ -1155,17 +1172,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                 }
                 append_ctl_name(kctl, control == UAC_FU_MUTE ?
                                 " Switch" : " Volume");
-                if (control == UAC_FU_VOLUME) {
-                        check_mapped_dB(map, cval);
-                        if (cval->dBmin < cval->dBmax || !cval->initialized) {
-                                kctl->tlv.c = mixer_vol_tlv;
-                                kctl->vd[0].access |= 
-                                        SNDRV_CTL_ELEM_ACCESS_TLV_READ |
-                                        SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;
-                        }
-                }
                 break;
-
         default:
                 if (! len)
                         strlcpy(kctl->id.name, audio_feature_info[control-1].name,
@@ -1173,6 +1180,19 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                 break;
         }
 
+        /* get min/max values */
+        get_min_max_with_quirks(cval, 0, kctl);
+
+        if (control == UAC_FU_VOLUME) {
+                check_mapped_dB(map, cval);
+                if (cval->dBmin < cval->dBmax || !cval->initialized) {
+                        kctl->tlv.c = snd_usb_mixer_vol_tlv;
+                        kctl->vd[0].access |=
+                                SNDRV_CTL_ELEM_ACCESS_TLV_READ |
+                                SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;
+                }
+        }
+
         range = (cval->max - cval->min) / cval->res;
         /* Are there devices with volume range more than 255? I use a bit more
          * to be sure. 384 is a resolution magic number found on Logitech
@@ -1388,7 +1408,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r
         for (pin = 0; pin < input_pins; pin++) {
                 err = parse_audio_unit(state, desc->baSourceID[pin]);
                 if (err < 0)
-                        return err;
+                        continue;
                 err = check_input_term(state, desc->baSourceID[pin], &iterm);
                 if (err < 0)
                         return err;