5 files changed, 38 insertions, 42 deletions

diff --git a/sound/usb/format.c b/sound/usb/format.c
index 69148212aa70..5b792d2c8061 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -76,7 +76,10 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
                 format = 1 << UAC_FORMAT_TYPE_I_PCM;
         }
         if (format & (1 << UAC_FORMAT_TYPE_I_PCM)) {
-                if (sample_width > sample_bytes * 8) {
+                if (chip->usb_id == USB_ID(0x0582, 0x0016) /* Edirol SD-90 */ &&
+                    sample_width == 24 && sample_bytes == 2)
+                        sample_bytes = 3;
+                else if (sample_width > sample_bytes * 8) {
                         snd_printk(KERN_INFO "%d:%u:%d : sample bitwidth %d in over sample bytes %d\n",
                                    chip->dev->devnum, fp->iface, fp->altsetting,
                                    sample_width, sample_bytes);
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 25bce7e5b1af..db2dc5ffe6dd 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -850,8 +850,8 @@ static void snd_usbmidi_us122l_output(struct snd_usb_midi_out_endpoint *ep,
                 return;
         }
 
-        memset(urb->transfer_buffer + count, 0xFD, 9 - count);
-        urb->transfer_buffer_length = count;
+        memset(urb->transfer_buffer + count, 0xFD, ep->max_transfer - count);
+        urb->transfer_buffer_length = ep->max_transfer;
 }
 
 static struct usb_protocol_ops snd_usbmidi_122l_ops = {
@@ -1295,6 +1295,13 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
         case USB_ID(0x1a86, 0x752d): /* QinHeng CH345 "USB2.0-MIDI" */
                 ep->max_transfer = 4;
                 break;
+                /*
+                 * Some devices only work with 9 bytes packet size:
+                 */
+        case USB_ID(0x0644, 0x800E): /* Tascam US-122L */
+        case USB_ID(0x0644, 0x800F): /* Tascam US-144 */
+                ep->max_transfer = 9;
+                break;
         }
         for (i = 0; i < OUTPUT_URBS; ++i) {
                 buffer = usb_alloc_coherent(umidi->dev,
@@ -1729,13 +1736,7 @@ static int roland_load_info(struct snd_kcontrol *kcontrol,
 {
         static const char *const names[] = { "High Load", "Light Load" };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item > 1)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int roland_load_get(struct snd_kcontrol *kcontrol,
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index f2d74d654b3c..7df89b3d7ded 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1633,18 +1633,11 @@ static int parse_audio_extension_unit(struct mixer_build *state, int unitid, voi
 static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         struct usb_mixer_elem_info *cval = kcontrol->private_data;
-        char **itemlist = (char **)kcontrol->private_value;
+        const char **itemlist = (const char **)kcontrol->private_value;
 
         if (snd_BUG_ON(!itemlist))
                 return -EINVAL;
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = cval->max;
-        if (uinfo->value.enumerated.item >= cval->max)
-                uinfo->value.enumerated.item = cval->max - 1;
-        strlcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item],
-                sizeof(uinfo->value.enumerated.name));
-        return 0;
+        return snd_ctl_enum_info(uinfo, 1, cval->max, itemlist);
 }
 
 /* get callback for selector unit */
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index ad7079d1676c..35999874d301 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -705,11 +705,11 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 .data = (const struct snd_usb_audio_quirk[]) {
                         {
                                 .ifnum = 0,
-                                .type = QUIRK_IGNORE_INTERFACE
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
                         },
                         {
                                 .ifnum = 1,
-                                .type = QUIRK_IGNORE_INTERFACE
+                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
                         },
                         {
                                 .ifnum = 2,
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index 6ef68e42138e..084e6fc8d5bf 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -273,29 +273,26 @@ static unsigned int usb_stream_hwdep_poll(struct snd_hwdep *hw,
                                           struct file *file, poll_table *wait)
 {
         struct us122l   *us122l = hw->private_data;
-        struct usb_stream *s = us122l->sk.s;
         unsigned        *polled;
         unsigned int    mask;
 
         poll_wait(file, &us122l->sk.sleep, wait);
 
-        switch (s->state) {
-        case usb_stream_ready:
-                if (us122l->first == file)
-                        polled = &s->periods_polled;
-                else
-                        polled = &us122l->second_periods_polled;
-                if (*polled != s->periods_done) {
-                        *polled = s->periods_done;
-                        mask = POLLIN | POLLOUT | POLLWRNORM;
-                        break;
+        mask = POLLIN | POLLOUT | POLLWRNORM | POLLERR;
+        if (mutex_trylock(&us122l->mutex)) {
+                struct usb_stream *s = us122l->sk.s;
+                if (s && s->state == usb_stream_ready) {
+                        if (us122l->first == file)
+                                polled = &s->periods_polled;
+                        else
+                                polled = &us122l->second_periods_polled;
+                        if (*polled != s->periods_done) {
+                                *polled = s->periods_done;
+                                mask = POLLIN | POLLOUT | POLLWRNORM;
+                        } else
+                                mask = 0;
                 }
-                /* Fall through */
-                mask = 0;
-                break;
-        default:
-                mask = POLLIN | POLLOUT | POLLWRNORM | POLLERR;
-                break;
+                mutex_unlock(&us122l->mutex);
         }
         return mask;
 }
@@ -381,6 +378,7 @@ static int usb_stream_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
 {
         struct usb_stream_config *cfg;
         struct us122l *us122l = hw->private_data;
+        struct usb_stream *s;
         unsigned min_period_frames;
         int err = 0;
         bool high_speed;
@@ -426,18 +424,18 @@ static int usb_stream_hwdep_ioctl(struct snd_hwdep *hw, struct file *file,
         snd_power_wait(hw->card, SNDRV_CTL_POWER_D0);
 
         mutex_lock(&us122l->mutex);
+        s = us122l->sk.s;
         if (!us122l->master)
                 us122l->master = file;
         else if (us122l->master != file) {
-                if (memcmp(cfg, &us122l->sk.s->cfg, sizeof(*cfg))) {
+                if (!s || memcmp(cfg, &s->cfg, sizeof(*cfg))) {
                         err = -EIO;
                         goto unlock;
                 }
                 us122l->slave = file;
         }
-        if (!us122l->sk.s ||
-            memcmp(cfg, &us122l->sk.s->cfg, sizeof(*cfg)) ||
-            us122l->sk.s->state == usb_stream_xrun) {
+        if (!s || memcmp(cfg, &s->cfg, sizeof(*cfg)) ||
+            s->state == usb_stream_xrun) {
                 us122l_stop(us122l);
                 if (!us122l_start(us122l, cfg->sample_rate, cfg->period_frames))
                         err = -EIO;
@@ -448,6 +446,7 @@ unlock:
         mutex_unlock(&us122l->mutex);
 free:
         kfree(cfg);
+        wake_up_all(&us122l->sk.sleep);
         return err;
 }