1 files changed, 30 insertions, 19 deletions

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index c22fa76e363a..60f65ace7474 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -152,6 +152,7 @@ static inline void check_mapped_dB(const struct usbmix_name_map *p,
         if (p && p->dB) {
                 cval->dBmin = p->dB->min;
                 cval->dBmax = p->dB->max;
+                cval->initialized = 1;
         }
 }
 
@@ -295,7 +296,7 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
                 if (snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request,
                                     USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
                                     validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
-                                    buf, val_len, 100) >= val_len) {
+                                    buf, val_len) >= val_len) {
                         *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));
                         snd_usb_autosuspend(cval->mixer->chip);
                         return 0;
@@ -332,7 +333,7 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v
         ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
                               USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
                               validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
-                              buf, size, 1000);
+                              buf, size);
         snd_usb_autosuspend(chip);
 
         if (ret < 0) {
@@ -444,7 +445,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
                                     usb_sndctrlpipe(chip->dev, 0), request,
                                     USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
                                     validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
-                                    buf, val_len, 100) >= 0) {
+                                    buf, val_len) >= 0) {
                         snd_usb_autosuspend(chip);
                         return 0;
                 }
@@ -880,8 +881,17 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
                 uinfo->value.integer.min = 0;
                 uinfo->value.integer.max = 1;
         } else {
-                if (! cval->initialized)
-                        get_min_max(cval,  0);
+                if (!cval->initialized) {
+                        get_min_max(cval, 0);
+                        if (cval->initialized && cval->dBmin >= cval->dBmax) {
+                                kcontrol->vd[0].access &= 
+                                        ~(SNDRV_CTL_ELEM_ACCESS_TLV_READ |
+                                          SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK);
+                                snd_ctl_notify(cval->mixer->chip->card,
+                                               SNDRV_CTL_EVENT_MASK_INFO,
+                                               &kcontrol->id);
+                        }
+                }
                 uinfo->value.integer.min = 0;
                 uinfo->value.integer.max =
                         (cval->max - cval->min + cval->res - 1) / cval->res;
@@ -1092,7 +1102,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                                 " Switch" : " Volume");
                 if (control == UAC_FU_VOLUME) {
                         check_mapped_dB(map, cval);
-                        if (cval->dBmin < cval->dBmax) {
+                        if (cval->dBmin < cval->dBmax || !cval->initialized) {
                                 kctl->tlv.c = mixer_vol_tlv;
                                 kctl->vd[0].access |= 
                                         SNDRV_CTL_ELEM_ACCESS_TLV_READ |
@@ -1191,6 +1201,11 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
 
         if (state->mixer->protocol == UAC_VERSION_1) {
                 csize = hdr->bControlSize;
+                if (!csize) {
+                        snd_printdd(KERN_ERR "usbaudio: unit %u: "
+                                    "invalid bControlSize == 0\n", unitid);
+                        return -EINVAL;
+                }
                 channels = (hdr->bLength - 7) / csize - 1;
                 bmaControls = hdr->bmaControls;
         } else {
@@ -1244,7 +1259,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void
                                 build_feature_ctl(state, _ftr, 0, i, &iterm, unitid, 0);
                 }
         } else { /* UAC_VERSION_2 */
-                for (i = 0; i < 30/2; i++) {
+                for (i = 0; i < ARRAY_SIZE(audio_feature_info); i++) {
                         unsigned int ch_bits = 0;
                         unsigned int ch_read_only = 0;
 
@@ -1934,15 +1949,13 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
         struct mixer_build state;
         int err;
         const struct usbmix_ctl_map *map;
-        struct usb_host_interface *hostif;
         void *p;
 
-        hostif = mixer->chip->ctrl_intf;
         memset(&state, 0, sizeof(state));
         state.chip = mixer->chip;
         state.mixer = mixer;
-        state.buffer = hostif->extra;
-        state.buflen = hostif->extralen;
+        state.buffer = mixer->hostif->extra;
+        state.buflen = mixer->hostif->extralen;
 
         /* check the mapping table */
         for (map = usbmix_ctl_maps; map->id; map++) {
@@ -1955,7 +1968,8 @@ static int snd_usb_mixer_controls(struct usb_mixer_interface *mixer)
         }
 
         p = NULL;
-        while ((p = snd_usb_find_csint_desc(hostif->extra, hostif->extralen, p, UAC_OUTPUT_TERMINAL)) != NULL) {
+        while ((p = snd_usb_find_csint_desc(mixer->hostif->extra, mixer->hostif->extralen,
+                                            p, UAC_OUTPUT_TERMINAL)) != NULL) {
                 if (mixer->protocol == UAC_VERSION_1) {
                         struct uac1_output_terminal_descriptor *desc = p;
 
@@ -2162,17 +2176,15 @@ int snd_usb_mixer_activate(struct usb_mixer_interface *mixer)
 /* create the handler for the optional status interrupt endpoint */
 static int snd_usb_mixer_status_create(struct usb_mixer_interface *mixer)
 {
-        struct usb_host_interface *hostif;
         struct usb_endpoint_descriptor *ep;
         void *transfer_buffer;
         int buffer_length;
         unsigned int epnum;
 
-        hostif = mixer->chip->ctrl_intf;
         /* we need one interrupt input endpoint */
-        if (get_iface_desc(hostif)->bNumEndpoints < 1)
+        if (get_iface_desc(mixer->hostif)->bNumEndpoints < 1)
                 return 0;
-        ep = get_endpoint(hostif, 0);
+        ep = get_endpoint(mixer->hostif, 0);
         if (!usb_endpoint_dir_in(ep) || !usb_endpoint_xfer_int(ep))
                 return 0;
 
@@ -2202,7 +2214,6 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
         };
         struct usb_mixer_interface *mixer;
         struct snd_info_entry *entry;
-        struct usb_host_interface *host_iface;
         int err;
 
         strcpy(chip->card->mixername, "USB Mixer");
@@ -2219,8 +2230,8 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif,
                 return -ENOMEM;
         }
 
-        host_iface = &usb_ifnum_to_if(chip->dev, ctrlif)->altsetting[0];
-        switch (get_iface_desc(host_iface)->bInterfaceProtocol) {
+        mixer->hostif = &usb_ifnum_to_if(chip->dev, ctrlif)->altsetting[0];
+        switch (get_iface_desc(mixer->hostif)->bInterfaceProtocol) {
         case UAC_VERSION_1:
         default:
                 mixer->protocol = UAC_VERSION_1;