6 files changed, 185 insertions, 148 deletions

diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index 64aed432ae2..7da0d0aa72c 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -485,7 +485,7 @@ static int __devinit snd_probe(struct usb_interface *intf,
                      const struct usb_device_id *id)
 {
         int ret;
-        struct snd_card *card;
+        struct snd_card *card = NULL;
         struct usb_device *device = interface_to_usbdev(intf);
 
         ret = create_card(device, intf, &card);
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index e6906901deb..0f647d22cb4 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -414,7 +414,7 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
 {
         struct list_head *p;
         struct snd_usb_endpoint *ep;
-        int ret, is_playback = direction == SNDRV_PCM_STREAM_PLAYBACK;
+        int is_playback = direction == SNDRV_PCM_STREAM_PLAYBACK;
 
         mutex_lock(&chip->mutex);
 
@@ -434,16 +434,6 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
                     type == SND_USB_ENDPOINT_TYPE_DATA ? "data" : "sync",
                     ep_num);
 
-        /* select the alt setting once so the endpoints become valid */
-        ret = usb_set_interface(chip->dev, alts->desc.bInterfaceNumber,
-                                alts->desc.bAlternateSetting);
-        if (ret < 0) {
-                snd_printk(KERN_ERR "%s(): usb_set_interface() failed, ret = %d\n",
-                                        __func__, ret);
-                ep = NULL;
-                goto __exit_unlock;
-        }
-
         ep = kzalloc(sizeof(*ep), GFP_KERNEL);
         if (!ep)
                 goto __exit_unlock;
@@ -831,9 +821,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep)
         if (++ep->use_count != 1)
                 return 0;
 
-        if (snd_BUG_ON(!test_bit(EP_FLAG_ACTIVATED, &ep->flags)))
-                return -EINVAL;
-
         /* just to be sure */
         deactivate_urbs(ep, 0, 1);
         wait_clear_urbs(ep);
@@ -911,9 +898,6 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep,
         if (snd_BUG_ON(ep->use_count == 0))
                 return;
 
-        if (snd_BUG_ON(!test_bit(EP_FLAG_ACTIVATED, &ep->flags)))
-                return;
-
         if (--ep->use_count == 0) {
                 deactivate_urbs(ep, force, can_sleep);
                 ep->data_subs = NULL;
@@ -927,42 +911,6 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep,
 }
 
 /**
- * snd_usb_endpoint_activate: activate an snd_usb_endpoint
- *
- * @ep: the endpoint to activate
- *
- * If the endpoint is not currently in use, this functions will select the
- * correct alternate interface setting for the interface of this endpoint.
- *
- * In case of any active users, this functions does nothing.
- *
- * Returns an error if usb_set_interface() failed, 0 in all other
- * cases.
- */
-int snd_usb_endpoint_activate(struct snd_usb_endpoint *ep)
-{
-        if (ep->use_count != 0)
-                return 0;
-
-        if (!ep->chip->shutdown &&
-            !test_and_set_bit(EP_FLAG_ACTIVATED, &ep->flags)) {
-                int ret;
-
-                ret = usb_set_interface(ep->chip->dev, ep->iface, ep->alt_idx);
-                if (ret < 0) {
-                        snd_printk(KERN_ERR "%s() usb_set_interface() failed, ret = %d\n",
-                                                __func__, ret);
-                        clear_bit(EP_FLAG_ACTIVATED, &ep->flags);
-                        return ret;
-                }
-
-                return 0;
-        }
-
-        return -EBUSY;
-}
-
-/**
  * snd_usb_endpoint_deactivate: deactivate an snd_usb_endpoint
  *
  * @ep: the endpoint to deactivate
@@ -980,24 +928,15 @@ int snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep)
         if (!ep)
                 return -EINVAL;
 
+        deactivate_urbs(ep, 1, 1);
+        wait_clear_urbs(ep);
+
         if (ep->use_count != 0)
                 return 0;
 
-        if (!ep->chip->shutdown &&
-            test_and_clear_bit(EP_FLAG_ACTIVATED, &ep->flags)) {
-                int ret;
-
-                ret = usb_set_interface(ep->chip->dev, ep->iface, 0);
-                if (ret < 0) {
-                        snd_printk(KERN_ERR "%s(): usb_set_interface() failed, ret = %d\n",
-                                                __func__, ret);
-                        return ret;
-                }
+        clear_bit(EP_FLAG_ACTIVATED, &ep->flags);
 
-                return 0;
-        }
-
-        return -EBUSY;
+        return 0;
 }
 
 /**
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
index 41daaa24c25..e71fe55cebe 100644
--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -341,6 +341,14 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
                 .map = audigy2nx_map,
                 .selector_map = audigy2nx_selectors,
         },
+        {       /* Logitech, Inc. QuickCam Pro for Notebooks */
+                .id = USB_ID(0x046d, 0x0991),
+                .ignore_ctl_error = 1,
+        },
+        {       /* Logitech, Inc. QuickCam E 3500 */
+                .id = USB_ID(0x046d, 0x09a4),
+                .ignore_ctl_error = 1,
+        },
         {
                 /* Hercules DJ Console (Windows Edition) */
                 .id = USB_ID(0x06f8, 0xb000),
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 41f4b691192..690000db0ec 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -42,6 +42,13 @@
 
 extern struct snd_kcontrol_new *snd_usb_feature_unit_ctl;
 
+struct std_mono_table {
+        unsigned int unitid, control, cmask;
+        int val_type;
+        const char *name;
+        snd_kcontrol_tlv_rw_t *tlv_callback;
+};
+
 /* private_free callback */
 static void usb_mixer_elem_free(struct snd_kcontrol *kctl)
 {
@@ -114,6 +121,25 @@ static int snd_create_std_mono_ctl(struct usb_mixer_interface *mixer,
 }
 
 /*
+ * Create a set of standard UAC controls from a table
+ */
+static int snd_create_std_mono_table(struct usb_mixer_interface *mixer,
+                                struct std_mono_table *t)
+{
+        int err;
+
+        while (t->name != NULL) {
+                err = snd_create_std_mono_ctl(mixer, t->unitid, t->control,
+                                t->cmask, t->val_type, t->name, t->tlv_callback);
+                if (err < 0)
+                        return err;
+                t++;
+        }
+
+        return 0;
+}
+
+/*
  * Sound Blaster remote control configuration
  *
  * format of remote control data:
@@ -916,61 +942,6 @@ static int snd_ftu_create_mixer(struct usb_mixer_interface *mixer)
         return 0;
 }
 
-
-/*
- * Create mixer for Electrix Ebox-44
- *
- * The mixer units from this device are corrupt, and even where they
- * are valid they presents mono controls as L and R channels of
- * stereo. So we create a good mixer in code.
- */
-
-static int snd_ebox44_create_mixer(struct usb_mixer_interface *mixer)
-{
-        int err;
-
-        err = snd_create_std_mono_ctl(mixer, 4, 1, 0x0, USB_MIXER_INV_BOOLEAN,
-                                "Headphone Playback Switch", NULL);
-        if (err < 0)
-                return err;
-        err = snd_create_std_mono_ctl(mixer, 4, 2, 0x1, USB_MIXER_S16,
-                                "Headphone A Mix Playback Volume", NULL);
-        if (err < 0)
-                return err;
-        err = snd_create_std_mono_ctl(mixer, 4, 2, 0x2, USB_MIXER_S16,
-                                "Headphone B Mix Playback Volume", NULL);
-        if (err < 0)
-                return err;
-
-        err = snd_create_std_mono_ctl(mixer, 7, 1, 0x0, USB_MIXER_INV_BOOLEAN,
-                                "Output Playback Switch", NULL);
-        if (err < 0)
-                return err;
-        err = snd_create_std_mono_ctl(mixer, 7, 2, 0x1, USB_MIXER_S16,
-                                "Output A Playback Volume", NULL);
-        if (err < 0)
-                return err;
-        err = snd_create_std_mono_ctl(mixer, 7, 2, 0x2, USB_MIXER_S16,
-                                "Output B Playback Volume", NULL);
-        if (err < 0)
-                return err;
-
-        err = snd_create_std_mono_ctl(mixer, 10, 1, 0x0, USB_MIXER_INV_BOOLEAN,
-                                "Input Capture Switch", NULL);
-        if (err < 0)
-                return err;
-        err = snd_create_std_mono_ctl(mixer, 10, 2, 0x1, USB_MIXER_S16,
-                                "Input A Capture Volume", NULL);
-        if (err < 0)
-                return err;
-        err = snd_create_std_mono_ctl(mixer, 10, 2, 0x2, USB_MIXER_S16,
-                                "Input B Capture Volume", NULL);
-        if (err < 0)
-                return err;
-
-        return 0;
-}
-
 void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
                                unsigned char samplerate_id)
 {
@@ -990,6 +961,81 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
         }
 }
 
+/*
+ * The mixer units for Ebox-44 are corrupt, and even where they
+ * are valid they presents mono controls as L and R channels of
+ * stereo. So we provide a good mixer here.
+ */
+struct std_mono_table ebox44_table[] = {
+        {
+                .unitid = 4,
+                .control = 1,
+                .cmask = 0x0,
+                .val_type = USB_MIXER_INV_BOOLEAN,
+                .name = "Headphone Playback Switch"
+        },
+        {
+                .unitid = 4,
+                .control = 2,
+                .cmask = 0x1,
+                .val_type = USB_MIXER_S16,
+                .name = "Headphone A Mix Playback Volume"
+        },
+        {
+                .unitid = 4,
+                .control = 2,
+                .cmask = 0x2,
+                .val_type = USB_MIXER_S16,
+                .name = "Headphone B Mix Playback Volume"
+        },
+
+        {
+                .unitid = 7,
+                .control = 1,
+                .cmask = 0x0,
+                .val_type = USB_MIXER_INV_BOOLEAN,
+                .name = "Output Playback Switch"
+        },
+        {
+                .unitid = 7,
+                .control = 2,
+                .cmask = 0x1,
+                .val_type = USB_MIXER_S16,
+                .name = "Output A Playback Volume"
+        },
+        {
+                .unitid = 7,
+                .control = 2,
+                .cmask = 0x2,
+                .val_type = USB_MIXER_S16,
+                .name = "Output B Playback Volume"
+        },
+
+        {
+                .unitid = 10,
+                .control = 1,
+                .cmask = 0x0,
+                .val_type = USB_MIXER_INV_BOOLEAN,
+                .name = "Input Capture Switch"
+        },
+        {
+                .unitid = 10,
+                .control = 2,
+                .cmask = 0x1,
+                .val_type = USB_MIXER_S16,
+                .name = "Input A Capture Volume"
+        },
+        {
+                .unitid = 10,
+                .control = 2,
+                .cmask = 0x2,
+                .val_type = USB_MIXER_S16,
+                .name = "Input B Capture Volume"
+        },
+
+        {}
+};
+
 int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
 {
         int err = 0;
@@ -1035,7 +1081,8 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
                 break;
 
         case USB_ID(0x200c, 0x1018): /* Electrix Ebox-44 */
-                err = snd_ebox44_create_mixer(mixer);
+                /* detection is disabled in mixer_maps.c */
+                err = snd_create_std_mono_table(mixer, ebox44_table);
                 break;
         }
 
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 54607f8c4f6..a1298f37942 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -261,19 +261,6 @@ static void stop_endpoints(struct snd_usb_substream *subs,
                                       force, can_sleep, wait);
 }
 
-static int activate_endpoints(struct snd_usb_substream *subs)
-{
-        if (subs->sync_endpoint) {
-                int ret;
-
-                ret = snd_usb_endpoint_activate(subs->sync_endpoint);
-                if (ret < 0)
-                        return ret;
-        }
-
-        return snd_usb_endpoint_activate(subs->data_endpoint);
-}
-
 static int deactivate_endpoints(struct snd_usb_substream *subs)
 {
         int reta, retb;
@@ -314,6 +301,33 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
         if (fmt == subs->cur_audiofmt)
                 return 0;
 
+        /* close the old interface */
+        if (subs->interface >= 0 && subs->interface != fmt->iface) {
+                err = usb_set_interface(subs->dev, subs->interface, 0);
+                if (err < 0) {
+                        snd_printk(KERN_ERR "%d:%d:%d: return to setting 0 failed (%d)\n",
+                                dev->devnum, fmt->iface, fmt->altsetting, err);
+                        return -EIO;
+                }
+                subs->interface = -1;
+                subs->altset_idx = 0;
+        }
+
+        /* set interface */
+        if (subs->interface != fmt->iface ||
+            subs->altset_idx != fmt->altset_idx) {
+                err = usb_set_interface(dev, fmt->iface, fmt->altsetting);
+                if (err < 0) {
+                        snd_printk(KERN_ERR "%d:%d:%d: usb_set_interface failed (%d)\n",
+                                   dev->devnum, fmt->iface, fmt->altsetting, err);
+                        return -EIO;
+                }
+                snd_printdd(KERN_INFO "setting usb interface %d:%d\n",
+                                fmt->iface, fmt->altsetting);
+                subs->interface = fmt->iface;
+                subs->altset_idx = fmt->altset_idx;
+        }
+
         subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip,
                                                    alts, fmt->endpoint, subs->direction,
                                                    SND_USB_ENDPOINT_TYPE_DATA);
@@ -387,7 +401,7 @@ add_sync_ep:
                 subs->data_endpoint->sync_master = subs->sync_endpoint;
         }
 
-        if ((err = snd_usb_init_pitch(subs->stream->chip, subs->interface, alts, fmt)) < 0)
+        if ((err = snd_usb_init_pitch(subs->stream->chip, fmt->iface, alts, fmt)) < 0)
                 return err;
 
         subs->cur_audiofmt = fmt;
@@ -450,7 +464,7 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
                 struct usb_interface *iface;
                 iface = usb_ifnum_to_if(subs->dev, fmt->iface);
                 alts = &iface->altsetting[fmt->altset_idx];
-                ret = snd_usb_init_sample_rate(subs->stream->chip, subs->interface, alts, fmt, rate);
+                ret = snd_usb_init_sample_rate(subs->stream->chip, fmt->iface, alts, fmt, rate);
                 if (ret < 0)
                         return ret;
                 subs->cur_rate = rate;
@@ -460,12 +474,6 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
                 mutex_lock(&subs->stream->chip->shutdown_mutex);
                 /* format changed */
                 stop_endpoints(subs, 0, 0, 0);
-                deactivate_endpoints(subs);
-
-                ret = activate_endpoints(subs);
-                if (ret < 0)
-                        goto unlock;
-
                 ret = snd_usb_endpoint_set_params(subs->data_endpoint, hw_params, fmt,
                                                   subs->sync_endpoint);
                 if (ret < 0)
@@ -500,6 +508,7 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream)
         subs->period_bytes = 0;
         mutex_lock(&subs->stream->chip->shutdown_mutex);
         stop_endpoints(subs, 0, 1, 1);
+        deactivate_endpoints(subs);
         mutex_unlock(&subs->stream->chip->shutdown_mutex);
         return snd_pcm_lib_free_vmalloc_buffer(substream);
 }
@@ -938,16 +947,20 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream, int direction)
 
 static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
 {
-        int ret;
         struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
         struct snd_usb_substream *subs = &as->substream[direction];
 
         stop_endpoints(subs, 0, 0, 0);
-        ret = deactivate_endpoints(subs);
+
+        if (!as->chip->shutdown && subs->interface >= 0) {
+                usb_set_interface(subs->dev, subs->interface, 0);
+                subs->interface = -1;
+        }
+
         subs->pcm_substream = NULL;
         snd_usb_autosuspend(subs->stream->chip);
 
-        return ret;
+        return 0;
 }
 
 /* Since a URB can handle only a single linear buffer, we must use double
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index d89ab4c7d44..79780fa57a4 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -1831,6 +1831,36 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
+{
+        USB_DEVICE(0x0582, 0x014d),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                /* .vendor_name = "BOSS", */
+                /* .product_name = "GT-100", */
+                .ifnum = QUIRK_ANY_INTERFACE,
+                .type = QUIRK_COMPOSITE,
+                .data = (const struct snd_usb_audio_quirk[]) {
+                        {
+                                .ifnum = 1,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 2,
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 3,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = & (const struct snd_usb_midi_endpoint_info) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 
 /* Guillemot devices */
 {