Patched in Tegra support.

author: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
committer: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
commit: 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree: a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /sound/usb
parent: 406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
48 files changed, 832 insertions, 4846 deletions
diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c
index 4394ae79635..c7dca7b0b9f 100644
--- a/sound/usb/6fire/chip.c
+++ b/sound/usb/6fire/chip.c
@@ -5,6 +5,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -28,13 +29,13 @@
 #include <sound/initval.h>
 MODULE_AUTHOR("Torsten Schenk <torsten.schenk@zoho.com>");
-MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver");
+MODULE_DESCRIPTION("TerraTec DMX 6Fire USB audio driver, version 0.3.0");
 MODULE_LICENSE("GPL v2");
 MODULE_SUPPORTED_DEVICE("{{TerraTec, DMX 6Fire USB}}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable card */
 static struct sfire_chip *chips[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
 static struct usb_device *devices[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
@@ -82,8 +83,8 @@ static void usb6fire_chip_destroy(struct sfire_chip *chip)
        }
 }
-static int usb6fire_chip_probe(struct usb_interface *intf,
+static int __devinit usb6fire_chip_probe(struct usb_interface *intf,
-                               const struct usb_device_id *usb_id)
+                const struct usb_device_id *usb_id)
 {
        int ret;
        int i;
@@ -210,11 +211,22 @@ static struct usb_device_id device_table[] = {
 MODULE_DEVICE_TABLE(usb, device_table);
-static struct usb_driver usb_driver = {
+static struct usb_driver driver = {
        .name = "snd-usb-6fire",
        .probe = usb6fire_chip_probe,
        .disconnect = usb6fire_chip_disconnect,
        .id_table = device_table,
 };
-module_usb_driver(usb_driver);
+static int __init usb6fire_chip_init(void)
+{
+        return usb_register(&driver);
+}
+static void __exit usb6fire_chip_cleanup(void)
+{
+        usb_deregister(&driver);
+}
+module_init(usb6fire_chip_init);
+module_exit(usb6fire_chip_cleanup);
diff --git a/sound/usb/6fire/chip.h b/sound/usb/6fire/chip.h
index bde02d105a5..d11e5cb520f 100644
--- a/sound/usb/6fire/chip.h
+++ b/sound/usb/6fire/chip.h
@@ -3,6 +3,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/sound/usb/6fire/comm.c b/sound/usb/6fire/comm.c
index 9e6e3ffd86b..c994daa57af 100644
--- a/sound/usb/6fire/comm.c
+++ b/sound/usb/6fire/comm.c
@@ -5,6 +5,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -125,17 +126,16 @@ static int usb6fire_comm_write16(struct comm_runtime *rt, u8 request,
        return usb6fire_comm_send_buffer(buffer, rt->chip->dev);
 }
-int usb6fire_comm_init(struct sfire_chip *chip)
+int __devinit usb6fire_comm_init(struct sfire_chip *chip)
 {
        struct comm_runtime *rt = kzalloc(sizeof(struct comm_runtime),
                        GFP_KERNEL);
-        struct urb *urb;
+        struct urb *urb = &rt->receiver;
        int ret;
        if (!rt)
                return -ENOMEM;
-        urb = &rt->receiver;
        rt->serial = 1;
        rt->chip = chip;
        usb_init_urb(urb);
diff --git a/sound/usb/6fire/comm.h b/sound/usb/6fire/comm.h
index 6a0840b0dcf..edc5dc84b88 100644
--- a/sound/usb/6fire/comm.h
+++ b/sound/usb/6fire/comm.h
@@ -3,6 +3,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -36,7 +37,7 @@ struct comm_runtime {
                        u8 vh, u8 vl);
 };
-int usb6fire_comm_init(struct sfire_chip *chip);
+int __devinit usb6fire_comm_init(struct sfire_chip *chip);
 void usb6fire_comm_abort(struct sfire_chip *chip);
 void usb6fire_comm_destroy(struct sfire_chip *chip);
 #endif /* USB6FIRE_COMM_H */
diff --git a/sound/usb/6fire/common.h b/sound/usb/6fire/common.h
index b6eb03ed1c2..7dbeb4a3783 100644
--- a/sound/usb/6fire/common.h
+++ b/sound/usb/6fire/common.h
@@ -3,6 +3,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/sound/usb/6fire/control.c b/sound/usb/6fire/control.c
index f6434c24572..ac828eff1a6 100644
--- a/sound/usb/6fire/control.c
+++ b/sound/usb/6fire/control.c
@@ -5,12 +5,9 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
- * Thanks to:
- * - Holger Ruckdeschel: he found out how to control individual channel
- *   volumes and introduced mute switch
- *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
@@ -19,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <sound/control.h>
-#include <sound/tlv.h>
 #include "control.h"
 #include "comm.h"
@@ -29,6 +25,26 @@ static char *opt_coax_texts[2] = { "Optical", "Coax" };
 static char *line_phono_texts[2] = { "Line", "Phono" };
 /*
+ * calculated with $value\[i\] = 128 \cdot sqrt[3]{\frac{i}{128}}$
+ * this is done because the linear values cause rapid degredation
+ * of volume in the uppermost region.
+ */
+static const u8 log_volume_table[128] = {
+        0x00, 0x19, 0x20, 0x24, 0x28, 0x2b, 0x2e, 0x30, 0x32, 0x34,
+        0x36, 0x38, 0x3a, 0x3b, 0x3d, 0x3e, 0x40, 0x41, 0x42, 0x43,
+        0x44, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e,
+        0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x53, 0x54, 0x55, 0x56,
+        0x56, 0x57, 0x58, 0x58, 0x59, 0x5a, 0x5b, 0x5b, 0x5c, 0x5c,
+        0x5d, 0x5e, 0x5e, 0x5f, 0x60, 0x60, 0x61, 0x61, 0x62, 0x62,
+        0x63, 0x63, 0x64, 0x65, 0x65, 0x66, 0x66, 0x67, 0x67, 0x68,
+        0x68, 0x69, 0x69, 0x6a, 0x6a, 0x6b, 0x6b, 0x6c, 0x6c, 0x6c,
+        0x6d, 0x6d, 0x6e, 0x6e, 0x6f, 0x6f, 0x70, 0x70, 0x70, 0x71,
+        0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x74, 0x75, 0x75,
+        0x75, 0x76, 0x76, 0x77, 0x77, 0x77, 0x78, 0x78, 0x78, 0x79,
+        0x79, 0x7a, 0x7a, 0x7a, 0x7b, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c,
+        0x7d, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x7f, 0x7f };
+/*
 * data that needs to be sent to device. sets up card internal stuff.
 * values dumped from windows driver and filtered by trial'n'error.
 */
@@ -43,7 +59,7 @@ init_data[] = {
        { 0x22, 0x03, 0x00 }, { 0x20, 0x03, 0x08 }, { 0x22, 0x04, 0x00 },
        { 0x20, 0x04, 0x08 }, { 0x22, 0x05, 0x01 }, { 0x20, 0x05, 0x08 },
        { 0x22, 0x04, 0x01 }, { 0x12, 0x04, 0x00 }, { 0x12, 0x05, 0x00 },
-        { 0x12, 0x0d, 0x38 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 },
+        { 0x12, 0x0d, 0x78 }, { 0x12, 0x21, 0x82 }, { 0x12, 0x22, 0x80 },
        { 0x12, 0x23, 0x00 }, { 0x12, 0x06, 0x02 }, { 0x12, 0x03, 0x00 },
        { 0x12, 0x02, 0x00 }, { 0x22, 0x03, 0x01 },
        { 0 } /* TERMINATING ENTRY */
@@ -54,47 +70,20 @@ static const int rates_altsetting[] = { 1, 1, 2, 2, 3, 3 };
 static const u16 rates_6fire_vl[] = {0x00, 0x01, 0x00, 0x01, 0x00, 0x01};
 static const u16 rates_6fire_vh[] = {0x11, 0x11, 0x10, 0x10, 0x00, 0x00};
-static DECLARE_TLV_DB_MINMAX(tlv_output, -9000, 0);
-static DECLARE_TLV_DB_MINMAX(tlv_input, -1500, 1500);
 enum {
        DIGITAL_THRU_ONLY_SAMPLERATE = 3
 };
-static void usb6fire_control_output_vol_update(struct control_runtime *rt)
+static void usb6fire_control_master_vol_update(struct control_runtime *rt)
 {
        struct comm_runtime *comm_rt = rt->chip->comm;
-        int i;
+        if (comm_rt) {
+                /* set volume */
-        if (comm_rt)
+                comm_rt->write8(comm_rt, 0x12, 0x0f, 0x7f -
-                for (i = 0; i < 6; i++)
+                                log_volume_table[rt->master_vol]);
-                        if (!(rt->ovol_updated & (1 << i))) {
+                 /* unmute */
-                                comm_rt->write8(comm_rt, 0x12, 0x0f + i,
+                comm_rt->write8(comm_rt, 0x12, 0x0e, 0x00);
-                                        180 - rt->output_vol[i]);
+        }
-                                rt->ovol_updated |= 1 << i;
-                        }
-}
-static void usb6fire_control_output_mute_update(struct control_runtime *rt)
-{
-        struct comm_runtime *comm_rt = rt->chip->comm;
-        if (comm_rt)
-                comm_rt->write8(comm_rt, 0x12, 0x0e, ~rt->output_mute);
-}
-static void usb6fire_control_input_vol_update(struct control_runtime *rt)
-{
-        struct comm_runtime *comm_rt = rt->chip->comm;
-        int i;
-        if (comm_rt)
-                for (i = 0; i < 2; i++)
-                        if (!(rt->ivol_updated & (1 << i))) {
-                                comm_rt->write8(comm_rt, 0x12, 0x1c + i,
-                                        rt->input_vol[i] & 0x3f);
-                                rt->ivol_updated |= 1 << i;
-                        }
 }
 static void usb6fire_control_line_phono_update(struct control_runtime *rt)
@@ -176,147 +165,34 @@ static int usb6fire_control_streaming_update(struct control_runtime *rt)
        return -EINVAL;
 }
-static int usb6fire_control_output_vol_info(struct snd_kcontrol *kcontrol,
+static int usb6fire_control_master_vol_info(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_info *uinfo)
 {
        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 2;
+        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 180;
-        return 0;
-}
-static int usb6fire_control_output_vol_put(struct snd_kcontrol *kcontrol,
-                struct snd_ctl_elem_value *ucontrol)
-{
-        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
-        unsigned int ch = kcontrol->private_value;
-        int changed = 0;
-        if (ch > 4) {
-                snd_printk(KERN_ERR PREFIX "Invalid channel in volume control.");
-                return -EINVAL;
-        }
-        if (rt->output_vol[ch] != ucontrol->value.integer.value[0]) {
-                rt->output_vol[ch] = ucontrol->value.integer.value[0];
-                rt->ovol_updated &= ~(1 << ch);
-                changed = 1;
-        }
-        if (rt->output_vol[ch + 1] != ucontrol->value.integer.value[1]) {
-                rt->output_vol[ch + 1] = ucontrol->value.integer.value[1];
-                rt->ovol_updated &= ~(2 << ch);
-                changed = 1;
-        }
-        if (changed)
-                usb6fire_control_output_vol_update(rt);
-        return changed;
-}
-static int usb6fire_control_output_vol_get(struct snd_kcontrol *kcontrol,
-                struct snd_ctl_elem_value *ucontrol)
-{
-        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
-        unsigned int ch = kcontrol->private_value;
-        if (ch > 4) {
-                snd_printk(KERN_ERR PREFIX "Invalid channel in volume control.");
-                return -EINVAL;
-        }
-        ucontrol->value.integer.value[0] = rt->output_vol[ch];
-        ucontrol->value.integer.value[1] = rt->output_vol[ch + 1];
-        return 0;
-}
-static int usb6fire_control_output_mute_put(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
-        unsigned int ch = kcontrol->private_value;
-        u8 old = rt->output_mute;
-        u8 value = 0;
-        if (ch > 4) {
-                snd_printk(KERN_ERR PREFIX "Invalid channel in volume control.");
-                return -EINVAL;
-        }
-        rt->output_mute &= ~(3 << ch);
-        if (ucontrol->value.integer.value[0])
-                value |= 1;
-        if (ucontrol->value.integer.value[1])
-                value |= 2;
-        rt->output_mute |= value << ch;
-        if (rt->output_mute != old)
-                usb6fire_control_output_mute_update(rt);
-        return rt->output_mute != old;
-}
-static int usb6fire_control_output_mute_get(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
-        unsigned int ch = kcontrol->private_value;
-        u8 value = rt->output_mute >> ch;
-        if (ch > 4) {
-                snd_printk(KERN_ERR PREFIX "Invalid channel in volume control.");
-                return -EINVAL;
-        }
-        ucontrol->value.integer.value[0] = 1 & value;
-        value >>= 1;
-        ucontrol->value.integer.value[1] = 1 & value;
-        return 0;
-}
-static int usb6fire_control_input_vol_info(struct snd_kcontrol *kcontrol,
-                struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = 2;
        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 30;
+        uinfo->value.integer.max = 127;
        return 0;
 }
-static int usb6fire_control_input_vol_put(struct snd_kcontrol *kcontrol,
+static int usb6fire_control_master_vol_put(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_value *ucontrol)
 {
        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
        int changed = 0;
+        if (rt->master_vol != ucontrol->value.integer.value[0]) {
-        if (rt->input_vol[0] != ucontrol->value.integer.value[0]) {
+                rt->master_vol = ucontrol->value.integer.value[0];
-                rt->input_vol[0] = ucontrol->value.integer.value[0] - 15;
+                usb6fire_control_master_vol_update(rt);
-                rt->ivol_updated &= ~(1 << 0);
-                changed = 1;
-        }
-        if (rt->input_vol[1] != ucontrol->value.integer.value[1]) {
-                rt->input_vol[1] = ucontrol->value.integer.value[1] - 15;
-                rt->ivol_updated &= ~(1 << 1);
                changed = 1;
        }
-        if (changed)
-                usb6fire_control_input_vol_update(rt);
        return changed;
 }
-static int usb6fire_control_input_vol_get(struct snd_kcontrol *kcontrol,
+static int usb6fire_control_master_vol_get(struct snd_kcontrol *kcontrol,
                struct snd_ctl_elem_value *ucontrol)
 {
        struct control_runtime *rt = snd_kcontrol_chip(kcontrol);
+        ucontrol->value.integer.value[0] = rt->master_vol;
-        ucontrol->value.integer.value[0] = rt->input_vol[0] + 15;
-        ucontrol->value.integer.value[1] = rt->input_vol[1] + 15;
        return 0;
 }
@@ -411,83 +287,18 @@ static int usb6fire_control_digital_thru_get(struct snd_kcontrol *kcontrol,
        return 0;
 }
-static struct snd_kcontrol_new vol_elements[] = {
+static struct __devinitdata snd_kcontrol_new elements[] = {
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Playback Volume",
+                .name = "Master Playback Volume",
                .index = 0,
-                .private_value = 0,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                        SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-                .info = usb6fire_control_output_vol_info,
-                .get = usb6fire_control_output_vol_get,
-                .put = usb6fire_control_output_vol_put,
-                .tlv = { .p = tlv_output }
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Playback Volume",
-                .index = 1,
-                .private_value = 2,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                        SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-                .info = usb6fire_control_output_vol_info,
-                .get = usb6fire_control_output_vol_get,
-                .put = usb6fire_control_output_vol_put,
-                .tlv = { .p = tlv_output }
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Playback Volume",
-                .index = 2,
-                .private_value = 4,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                        SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-                .info = usb6fire_control_output_vol_info,
-                .get = usb6fire_control_output_vol_get,
-                .put = usb6fire_control_output_vol_put,
-                .tlv = { .p = tlv_output }
-        },
-        {}
-};
-static struct snd_kcontrol_new mute_elements[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Playback Switch",
-                .index = 0,
-                .private_value = 0,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-                .info = snd_ctl_boolean_stereo_info,
-                .get = usb6fire_control_output_mute_get,
-                .put = usb6fire_control_output_mute_put,
-        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Playback Switch",
-                .index = 1,
-                .private_value = 2,
                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-                .info = snd_ctl_boolean_stereo_info,
+                .info = usb6fire_control_master_vol_info,
-                .get = usb6fire_control_output_mute_get,
+                .get = usb6fire_control_master_vol_get,
-                .put = usb6fire_control_output_mute_put,
+                .put = usb6fire_control_master_vol_put
        },
        {
                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Playback Switch",
-                .index = 2,
-                .private_value = 4,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-                .info = snd_ctl_boolean_stereo_info,
-                .get = usb6fire_control_output_mute_get,
-                .put = usb6fire_control_output_mute_put,
-        },
-        {}
-};
-static struct snd_kcontrol_new elements[] = {
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                .name = "Line/Phono Capture Route",
                .index = 0,
                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -513,55 +324,10 @@ static struct snd_kcontrol_new elements[] = {
                .get = usb6fire_control_digital_thru_get,
                .put = usb6fire_control_digital_thru_put
        },
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Analog Capture Volume",
-                .index = 0,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
-                        SNDRV_CTL_ELEM_ACCESS_TLV_READ,
-                .info = usb6fire_control_input_vol_info,
-                .get = usb6fire_control_input_vol_get,
-                .put = usb6fire_control_input_vol_put,
-                .tlv = { .p = tlv_input }
-        },
        {}
 };
-static int usb6fire_control_add_virtual(
+int __devinit usb6fire_control_init(struct sfire_chip *chip)
-        struct control_runtime *rt,
-        struct snd_card *card,
-        char *name,
-        struct snd_kcontrol_new *elems)
-{
-        int ret;
-        int i;
-        struct snd_kcontrol *vmaster =
-                snd_ctl_make_virtual_master(name, tlv_output);
-        struct snd_kcontrol *control;
-        if (!vmaster)
-                return -ENOMEM;
-        ret = snd_ctl_add(card, vmaster);
-        if (ret < 0)
-                return ret;
-        i = 0;
-        while (elems[i].name) {
-                control = snd_ctl_new1(&elems[i], rt);
-                if (!control)
-                        return -ENOMEM;
-                ret = snd_ctl_add(card, control);
-                if (ret < 0)
-                        return ret;
-                ret = snd_ctl_add_slave(vmaster, control);
-                if (ret < 0)
-                        return ret;
-                i++;
-        }
-        return 0;
-}
-int usb6fire_control_init(struct sfire_chip *chip)
 {
        int i;
        int ret;
@@ -586,26 +352,9 @@ int usb6fire_control_init(struct sfire_chip *chip)
        usb6fire_control_opt_coax_update(rt);
        usb6fire_control_line_phono_update(rt);
-        usb6fire_control_output_vol_update(rt);
+        usb6fire_control_master_vol_update(rt);
-        usb6fire_control_output_mute_update(rt);
-        usb6fire_control_input_vol_update(rt);
        usb6fire_control_streaming_update(rt);
-        ret = usb6fire_control_add_virtual(rt, chip->card,
-                "Master Playback Volume", vol_elements);
-        if (ret) {
-                snd_printk(KERN_ERR PREFIX "cannot add control.\n");
-                kfree(rt);
-                return ret;
-        }
-        ret = usb6fire_control_add_virtual(rt, chip->card,
-                "Master Playback Switch", mute_elements);
-        if (ret) {
-                snd_printk(KERN_ERR PREFIX "cannot add control.\n");
-                kfree(rt);
-                return ret;
-        }
        i = 0;
        while (elements[i].name) {
                ret = snd_ctl_add(chip->card, snd_ctl_new1(&elements[i], rt));
diff --git a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h
index 5a40ba14348..8f5aeead2e3 100644
--- a/sound/usb/6fire/control.h
+++ b/sound/usb/6fire/control.h
@@ -3,6 +3,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -43,14 +44,10 @@ struct control_runtime {
        bool line_phono_switch;
        bool digital_thru_switch;
        bool usb_streaming;
-        u8 output_vol[6];
+        u8 master_vol;
-        u8 ovol_updated;
-        u8 output_mute;
-        s8 input_vol[2];
-        u8 ivol_updated;
 };
-int usb6fire_control_init(struct sfire_chip *chip);
+int __devinit usb6fire_control_init(struct sfire_chip *chip);
 void usb6fire_control_abort(struct sfire_chip *chip);
 void usb6fire_control_destroy(struct sfire_chip *chip);
 #endif /* USB6FIRE_CONTROL_H */
diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
index a1d9b0792a1..1e3ae3327dd 100644
--- a/sound/usb/6fire/firmware.c
+++ b/sound/usb/6fire/firmware.c
@@ -5,6 +5,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -14,9 +15,7 @@
 */
 #include <linux/firmware.h>
-#include <linux/module.h>
 #include <linux/bitrev.h>
-#include <linux/kernel.h>
 #include "firmware.h"
 #include "chip.h"
@@ -60,19 +59,21 @@ struct ihex_record {
        unsigned int txt_offset; /* current position in txt_data */
 };
-static u8 usb6fire_fw_ihex_hex(const u8 *data, u8 *crc)
+static u8 usb6fire_fw_ihex_nibble(const u8 n)
 {
-        u8 val = 0;
+        if (n >= '0' && n <= '9')
-        int hval;
+                return n - '0';
+        else if (n >= 'A' && n <= 'F')
-        hval = hex_to_bin(data[0]);
+                return n - ('A' - 10);
-        if (hval >= 0)
+        else if (n >= 'a' && n <= 'f')
-                val |= (hval << 4);
+                return n - ('a' - 10);
+        return 0;
-        hval = hex_to_bin(data[1]);
+}
-        if (hval >= 0)
-                val |= hval;
+static u8 usb6fire_fw_ihex_hex(const u8 *data, u8 *crc)
+{
+        u8 val = (usb6fire_fw_ihex_nibble(data[0]) << 4) |
+                        usb6fire_fw_ihex_nibble(data[1]);
        *crc += val;
        return val;
 }
@@ -209,7 +210,7 @@ static int usb6fire_fw_ezusb_upload(
        int ret;
        u8 data;
        struct usb_device *device = interface_to_usbdev(intf);
-        const struct firmware *fw = NULL;
+        const struct firmware *fw = 0;
        struct ihex_record *rec = kmalloc(sizeof(struct ihex_record),
                        GFP_KERNEL);
@@ -346,10 +347,11 @@ static int usb6fire_fw_check(u8 *version)
                if (!memcmp(version, known_fw_versions + i, 4))
                        return 0;
-        snd_printk(KERN_ERR PREFIX "invalid fimware version in device: %*ph. "
+        snd_printk(KERN_ERR PREFIX "invalid fimware version in device: "
+                        "%02x %02x %02x %02x. "
                        "please reconnect to power. if this failure "
                        "still happens, check your firmware installation.",
-                        4, version);
+                        version[0], version[1], version[2], version[3]);
        return -EINVAL;
 }
diff --git a/sound/usb/6fire/firmware.h b/sound/usb/6fire/firmware.h
index c109c4f75ab..00856989538 100644
--- a/sound/usb/6fire/firmware.h
+++ b/sound/usb/6fire/firmware.h
@@ -22,6 +22,6 @@ enum /* firmware state of device */
        FW_NOT_READY = 1
 };
-int usb6fire_fw_init(struct usb_interface *intf);
+int __devinit usb6fire_fw_init(struct usb_interface *intf);
 #endif /* USB6FIRE_FIRMWARE_H */
diff --git a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c
index 26722423330..13f4509dce2 100644
--- a/sound/usb/6fire/midi.c
+++ b/sound/usb/6fire/midi.c
@@ -5,6 +5,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -146,7 +147,7 @@ static struct snd_rawmidi_ops in_ops = {
        .trigger = usb6fire_midi_in_trigger
 };
-int usb6fire_midi_init(struct sfire_chip *chip)
+int __devinit usb6fire_midi_init(struct sfire_chip *chip)
 {
        int ret;
        struct midi_runtime *rt = kzalloc(sizeof(struct midi_runtime),
diff --git a/sound/usb/6fire/midi.h b/sound/usb/6fire/midi.h
index c321006e543..97a7bf66913 100644
--- a/sound/usb/6fire/midi.h
+++ b/sound/usb/6fire/midi.h
@@ -3,6 +3,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -38,7 +39,7 @@ struct midi_runtime {
        void (*in_received)(struct midi_runtime *rt, u8 *data, int length);
 };
-int usb6fire_midi_init(struct sfire_chip *chip);
+int __devinit usb6fire_midi_init(struct sfire_chip *chip);
 void usb6fire_midi_abort(struct sfire_chip *chip);
 void usb6fire_midi_destroy(struct sfire_chip *chip);
 #endif /* USB6FIRE_MIDI_H */
diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c
index e2ca12fe92e..d144cdb2f15 100644
--- a/sound/usb/6fire/pcm.c
+++ b/sound/usb/6fire/pcm.c
@@ -5,6 +5,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -135,9 +136,6 @@ static void usb6fire_pcm_stream_stop(struct pcm_runtime *rt)
        struct control_runtime *ctrl_rt = rt->chip->control;
        if (rt->stream_state != STREAM_DISABLED) {
-                rt->stream_state = STREAM_STOPPING;
                for (i = 0; i < PCM_N_URBS; i++) {
                        usb_kill_urb(&rt->in_urbs[i].instance);
                        usb_kill_urb(&rt->out_urbs[i].instance);
@@ -562,9 +560,9 @@ static struct snd_pcm_ops pcm_ops = {
        .pointer = usb6fire_pcm_pointer,
 };
-static void usb6fire_pcm_init_urb(struct pcm_urb *urb,
+static void __devinit usb6fire_pcm_init_urb(struct pcm_urb *urb,
-                                  struct sfire_chip *chip, bool in, int ep,
+                struct sfire_chip *chip, bool in, int ep,
-                                  void (*handler)(struct urb *))
+                void (*handler)(struct urb *))
 {
        urb->chip = chip;
        usb_init_urb(&urb->instance);
@@ -581,7 +579,7 @@ static void usb6fire_pcm_init_urb(struct pcm_urb *urb,
        urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB;
 }
-int usb6fire_pcm_init(struct sfire_chip *chip)
+int __devinit usb6fire_pcm_init(struct sfire_chip *chip)
 {
        int i;
        int ret;
diff --git a/sound/usb/6fire/pcm.h b/sound/usb/6fire/pcm.h
index 9b01133ee3f..2bee8137400 100644
--- a/sound/usb/6fire/pcm.h
+++ b/sound/usb/6fire/pcm.h
@@ -3,6 +3,7 @@
 *
 * Author:      Torsten Schenk <torsten.schenk@zoho.com>
 * Created:     Jan 01, 2011
+ * Version:     0.3.0
 * Copyright:   (C) Torsten Schenk
 *
 * This program is free software; you can redistribute it and/or modify
@@ -69,7 +70,7 @@ struct pcm_runtime {
        bool stream_wait_cond;
 };
-int usb6fire_pcm_init(struct sfire_chip *chip);
+int __devinit usb6fire_pcm_init(struct sfire_chip *chip);
 void usb6fire_pcm_abort(struct sfire_chip *chip);
 void usb6fire_pcm_destroy(struct sfire_chip *chip);
 #endif /* USB6FIRE_PCM_H */
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 225dfd73726..8beb77563da 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -67,7 +67,6 @@ config SND_USB_CAIAQ
            * Native Instruments Guitar Rig mobile
            * Native Instruments Traktor Kontrol X1
            * Native Instruments Traktor Kontrol S4
-            * Native Instruments Maschine Controller
           To compile this driver as a module, choose M here: the module
           will be called snd-usb-caiaq.
@@ -86,11 +85,10 @@ config SND_USB_CAIAQ_INPUT
           * Native Instruments Kore Controller 2
           * Native Instruments Audio Kontrol 1
           * Native Instruments Traktor Kontrol S4
-           * Native Instruments Maschine Controller
 config SND_USB_US122L
        tristate "Tascam US-122L USB driver"
-        depends on X86
+        depends on X86 && EXPERIMENTAL
        select SND_HWDEP
        select SND_RAWMIDI
        help
@@ -106,7 +104,6 @@ config SND_USB_6FIRE
        select BITREVERSE
        select SND_RAWMIDI
        select SND_PCM
-        select SND_VMASTER
        help
          Say Y here to include support for TerraTec 6fire DMX USB interface.
diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index ac256dc4c6b..cf9ed66445f 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -3,16 +3,16 @@
 #
 snd-usb-audio-objs :=   card.o \
-                        clock.o \
-                        endpoint.o \
-                        format.o \
-                        helper.o \
                        mixer.o \
                        mixer_quirks.o \
-                        pcm.o \
                        proc.o \
                        quirks.o \
-                        stream.o
+                        format.o \
+                        endpoint.o \
+                        urb.o \
+                        pcm.o \
+                        helper.o \
+                        clock.o
 snd-usbmidi-lib-objs := midi.o
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index fde9a7a29cb..2cf87f5afed 100644
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -311,10 +311,8 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
        spin_lock(&dev->spinlock);
-        if (dev->input_panic || dev->output_panic) {
+        if (dev->input_panic || dev->output_panic)
                ptr = SNDRV_PCM_POS_XRUN;
-                goto unlock;
-        }
        if (sub->stream == SNDRV_PCM_STREAM_PLAYBACK)
                ptr = bytes_to_frames(sub->runtime,
@@ -323,7 +321,6 @@ snd_usb_caiaq_pcm_pointer(struct snd_pcm_substream *sub)
                ptr = bytes_to_frames(sub->runtime,
                                        dev->audio_in_buf_pos[index]);
-unlock:
        spin_unlock(&dev->spinlock);
        return ptr;
 }
diff --git a/sound/usb/caiaq/control.c b/sound/usb/caiaq/control.c
index adb8d03267a..00e5d0a469e 100644
--- a/sound/usb/caiaq/control.c
+++ b/sound/usb/caiaq/control.c
@@ -137,7 +137,7 @@ static int control_put(struct snd_kcontrol *kcontrol,
        return 1;
 }
-static struct snd_kcontrol_new kcontrol_template = {
+static struct snd_kcontrol_new kcontrol_template __devinitdata = {
        .iface = SNDRV_CTL_ELEM_IFACE_HWDEP,
        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
        .index = 0,
@@ -489,8 +489,8 @@ static struct caiaq_controller kontrols4_controller[] = {
        { "LED: FX2: Mode",                     133 | CNT_INTVAL },
 };
-static int add_controls(struct caiaq_controller *c, int num,
+static int __devinit add_controls(struct caiaq_controller *c, int num,
-                        struct snd_usb_caiaqdev *dev)
+                                  struct snd_usb_caiaqdev *dev)
 {
        int i, ret;
        struct snd_kcontrol *kc;
@@ -507,7 +507,7 @@ static int add_controls(struct caiaq_controller *c, int num,
        return 0;
 }
-int snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
+int __devinit snd_usb_caiaq_control_init(struct snd_usb_caiaqdev *dev)
 {
        int ret = 0;
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index c828f8189c2..45bc4a2dc6f 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -50,12 +50,11 @@ MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
                         "{Native Instruments, Session I/O},"
                         "{Native Instruments, GuitarRig mobile}"
                         "{Native Instruments, Traktor Kontrol X1}"
-                         "{Native Instruments, Traktor Kontrol S4}"
+                         "{Native Instruments, Traktor Kontrol S4}");
-                         "{Native Instruments, Maschine Controller}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
 static int snd_card_used[SNDRV_CARDS];
 module_param_array(index, int, NULL, 0444);
@@ -147,11 +146,6 @@ static struct usb_device_id snd_usb_id_table[] = {
                .idVendor =     USB_VID_NATIVEINSTRUMENTS,
                .idProduct =    USB_PID_TRAKTORAUDIO2
        },
-        {
-                .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
-                .idVendor =     USB_VID_NATIVEINSTRUMENTS,
-                .idProduct =    USB_PID_MASCHINECONTROLLER
-        },
        { /* terminator */ }
 };
@@ -289,7 +283,7 @@ int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
                                          tmp, sizeof(tmp));
 }
-static void setup_card(struct snd_usb_caiaqdev *dev)
+static void __devinit setup_card(struct snd_usb_caiaqdev *dev)
 {
        int ret;
        char val[4];
@@ -407,7 +401,7 @@ static int create_card(struct usb_device *usb_dev,
        return 0;
 }
-static int init_card(struct snd_usb_caiaqdev *dev)
+static int __devinit init_card(struct snd_usb_caiaqdev *dev)
 {
        char *c, usbpath[32];
        struct usb_device *usb_dev = dev->chip.dev;
@@ -481,11 +475,11 @@ static int init_card(struct snd_usb_caiaqdev *dev)
        return 0;
 }
-static int snd_probe(struct usb_interface *intf,
+static int __devinit snd_probe(struct usb_interface *intf,
                     const struct usb_device_id *id)
 {
        int ret;
-        struct snd_card *card = NULL;
+        struct snd_card *card;
        struct usb_device *device = interface_to_usbdev(intf);
        ret = create_card(device, intf, &card);
@@ -538,5 +532,16 @@ static struct usb_driver snd_usb_driver = {
        .id_table       = snd_usb_id_table,
 };
-module_usb_driver(snd_usb_driver);
+static int __init snd_module_init(void)
+{
+        return usb_register(&snd_usb_driver);
+}
+static void __exit snd_module_exit(void)
+{
+        usb_deregister(&snd_usb_driver);
+}
+module_init(snd_module_init)
+module_exit(snd_module_exit)
diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h
index 562b0bff9c4..3f9c6339ae9 100644
--- a/sound/usb/caiaq/device.h
+++ b/sound/usb/caiaq/device.h
@@ -18,7 +18,6 @@
 #define USB_PID_TRAKTORKONTROLX1        0x2305
 #define USB_PID_TRAKTORKONTROLS4        0xbaff
 #define USB_PID_TRAKTORAUDIO2           0x041d
-#define USB_PID_MASCHINECONTROLLER  0x0808
 #define EP1_BUFSIZE 64
 #define EP4_BUFSIZE 512
diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
index 26a121b42c3..a213813487b 100644
--- a/sound/usb/caiaq/input.c
+++ b/sound/usb/caiaq/input.c
@@ -67,61 +67,6 @@ static unsigned short keycode_kore[] = {
        KEY_BRL_DOT5
 };
-#define MASCHINE_BUTTONS   (42)
-#define MASCHINE_BUTTON(X) ((X) + BTN_MISC)
-#define MASCHINE_PADS      (16)
-#define MASCHINE_PAD(X)    ((X) + ABS_PRESSURE)
-static unsigned short keycode_maschine[] = {
-        MASCHINE_BUTTON(40), /* mute       */
-        MASCHINE_BUTTON(39), /* solo       */
-        MASCHINE_BUTTON(38), /* select     */
-        MASCHINE_BUTTON(37), /* duplicate  */
-        MASCHINE_BUTTON(36), /* navigate   */
-        MASCHINE_BUTTON(35), /* pad mode   */
-        MASCHINE_BUTTON(34), /* pattern    */
-        MASCHINE_BUTTON(33), /* scene      */
-        KEY_RESERVED, /* spacer */
-        MASCHINE_BUTTON(30), /* rec        */
-        MASCHINE_BUTTON(31), /* erase      */
-        MASCHINE_BUTTON(32), /* shift      */
-        MASCHINE_BUTTON(28), /* grid       */
-        MASCHINE_BUTTON(27), /* >          */
-        MASCHINE_BUTTON(26), /* <          */
-        MASCHINE_BUTTON(25), /* restart    */
-        MASCHINE_BUTTON(21), /* E          */
-        MASCHINE_BUTTON(22), /* F          */
-        MASCHINE_BUTTON(23), /* G          */
-        MASCHINE_BUTTON(24), /* H          */
-        MASCHINE_BUTTON(20), /* D          */
-        MASCHINE_BUTTON(19), /* C          */
-        MASCHINE_BUTTON(18), /* B          */
-        MASCHINE_BUTTON(17), /* A          */
-        MASCHINE_BUTTON(0),  /* control    */
-        MASCHINE_BUTTON(2),  /* browse     */
-        MASCHINE_BUTTON(4),  /* <          */
-        MASCHINE_BUTTON(6),  /* snap       */
-        MASCHINE_BUTTON(7),  /* autowrite  */
-        MASCHINE_BUTTON(5),  /* >          */
-        MASCHINE_BUTTON(3),  /* sampling   */
-        MASCHINE_BUTTON(1),  /* step       */
-        MASCHINE_BUTTON(15), /* 8 softkeys */
-        MASCHINE_BUTTON(14),
-        MASCHINE_BUTTON(13),
-        MASCHINE_BUTTON(12),
-        MASCHINE_BUTTON(11),
-        MASCHINE_BUTTON(10),
-        MASCHINE_BUTTON(9),
-        MASCHINE_BUTTON(8),
-        MASCHINE_BUTTON(16), /* note repeat */
-        MASCHINE_BUTTON(29)  /* play        */
-};
 #define KONTROLX1_INPUTS        (40)
 #define KONTROLS4_BUTTONS       (12 * 8)
 #define KONTROLS4_AXIS          (46)
@@ -273,29 +218,6 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
                input_report_abs(input_dev, ABS_HAT3Y, i);
                input_sync(input_dev);
                break;
-        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
-                /* 4 under the left screen */
-                input_report_abs(input_dev, ABS_HAT0X, decode_erp(buf[21], buf[20]));
-                input_report_abs(input_dev, ABS_HAT0Y, decode_erp(buf[15], buf[14]));
-                input_report_abs(input_dev, ABS_HAT1X, decode_erp(buf[9],  buf[8]));
-                input_report_abs(input_dev, ABS_HAT1Y, decode_erp(buf[3],  buf[2]));
-                /* 4 under the right screen */
-                input_report_abs(input_dev, ABS_HAT2X, decode_erp(buf[19], buf[18]));
-                input_report_abs(input_dev, ABS_HAT2Y, decode_erp(buf[13], buf[12]));
-                input_report_abs(input_dev, ABS_HAT3X, decode_erp(buf[7],  buf[6]));
-                input_report_abs(input_dev, ABS_HAT3Y, decode_erp(buf[1],  buf[0]));
-                /* volume */
-                input_report_abs(input_dev, ABS_RX, decode_erp(buf[17], buf[16]));
-                /* tempo */
-                input_report_abs(input_dev, ABS_RY, decode_erp(buf[11], buf[10]));
-                /* swing */
-                input_report_abs(input_dev, ABS_RZ, decode_erp(buf[5],  buf[4]));
-                input_sync(input_dev);
-                break;
        }
 }
@@ -478,25 +400,6 @@ static void snd_usb_caiaq_tks4_dispatch(struct snd_usb_caiaqdev *dev,
        input_sync(dev->input_dev);
 }
-#define MASCHINE_MSGBLOCK_SIZE 2
-static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *dev,
-                                        const unsigned char *buf,
-                                        unsigned int len)
-{
-        unsigned int i, pad_id;
-        uint16_t pressure;
-        for (i = 0; i < MASCHINE_PADS; i++) {
-                pressure = be16_to_cpu(buf[i * 2] << 8 | buf[(i * 2) + 1]);
-                pad_id = pressure >> 12;
-                input_report_abs(dev->input_dev, MASCHINE_PAD(pad_id), pressure & 0xfff);
-        }
-        input_sync(dev->input_dev);
-}
 static void snd_usb_caiaq_ep4_reply_dispatch(struct urb *urb)
 {
        struct snd_usb_caiaqdev *dev = urb->context;
@@ -522,13 +425,6 @@ static void snd_usb_caiaq_ep4_reply_dispatch(struct urb *urb)
        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
                snd_usb_caiaq_tks4_dispatch(dev, buf, urb->actual_length);
                break;
-        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
-                if (urb->actual_length < (MASCHINE_PADS * MASCHINE_MSGBLOCK_SIZE))
-                        goto requeue;
-                snd_usb_caiaq_maschine_dispatch(dev, buf, urb->actual_length);
-                break;
        }
 requeue:
@@ -548,7 +444,6 @@ static int snd_usb_caiaq_input_open(struct input_dev *idev)
        switch (dev->chip.usb_id) {
        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
-        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
                if (usb_submit_urb(dev->ep4_in_urb, GFP_KERNEL) != 0)
                        return -EIO;
                break;
@@ -567,7 +462,6 @@ static void snd_usb_caiaq_input_close(struct input_dev *idev)
        switch (dev->chip.usb_id) {
        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLX1):
        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_TRAKTORKONTROLS4):
-        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
                usb_kill_urb(dev->ep4_in_urb);
                break;
        }
@@ -758,50 +652,6 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                break;
-        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_MASCHINECONTROLLER):
-                input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-                input->absbit[0] = BIT_MASK(ABS_HAT0X) | BIT_MASK(ABS_HAT0Y) |
-                        BIT_MASK(ABS_HAT1X) | BIT_MASK(ABS_HAT1Y) |
-                        BIT_MASK(ABS_HAT2X) | BIT_MASK(ABS_HAT2Y) |
-                        BIT_MASK(ABS_HAT3X) | BIT_MASK(ABS_HAT3Y) |
-                        BIT_MASK(ABS_RX) | BIT_MASK(ABS_RY) |
-                        BIT_MASK(ABS_RZ);
-                BUILD_BUG_ON(sizeof(dev->keycode) < sizeof(keycode_maschine));
-                memcpy(dev->keycode, keycode_maschine, sizeof(keycode_maschine));
-                input->keycodemax = ARRAY_SIZE(keycode_maschine);
-                for (i = 0; i < MASCHINE_PADS; i++) {
-                        input->absbit[0] |= MASCHINE_PAD(i);
-                        input_set_abs_params(input, MASCHINE_PAD(i), 0, 0xfff, 5, 10);
-                }
-                input_set_abs_params(input, ABS_HAT0X, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT0Y, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT1X, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT1Y, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT2X, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT2Y, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT3X, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_HAT3Y, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_RX, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_RY, 0, 999, 0, 10);
-                input_set_abs_params(input, ABS_RZ, 0, 999, 0, 10);
-                dev->ep4_in_urb = usb_alloc_urb(0, GFP_KERNEL);
-                if (!dev->ep4_in_urb) {
-                        ret = -ENOMEM;
-                        goto exit_free_idev;
-                }
-                usb_fill_bulk_urb(dev->ep4_in_urb, usb_dev,
-                                  usb_rcvbulkpipe(usb_dev, 0x4),
-                                  dev->ep4_in_buf, EP4_BUFSIZE,
-                                  snd_usb_caiaq_ep4_reply_dispatch, dev);
-                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 5);
-                break;
        default:
                /* no input methods supported on this device */
                goto exit_free_idev;
@@ -814,17 +664,15 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
        for (i = 0; i < input->keycodemax; i++)
                __set_bit(dev->keycode[i], input->keybit);
-        dev->input_dev = input;
        ret = input_register_device(input);
        if (ret < 0)
                goto exit_free_idev;
+        dev->input_dev = input;
        return 0;
 exit_free_idev:
        input_free_device(input);
-        dev->input_dev = NULL;
        return ret;
 }
@@ -840,3 +688,4 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev)
        input_unregister_device(dev->input_dev);
        dev->input_dev = NULL;
 }
diff --git a/sound/usb/card.c b/sound/usb/card.c
index ccf95cfe186..d8f2bf40145 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -25,6 +25,9 @@
 *
 *  NOTES:
 *
+ *   - async unlink should be used for avoiding the sleep inside lock.
+ *     2.4.22 usb-uhci seems buggy for async unlinking and results in
+ *     oops.  in such a cse, pass async_unlink=0 option.
 *   - the linked URBs would be preferred but not used so far because of
 *     the instability of unlinking.
 *   - type II is not supported properly.  there is no device which supports
@@ -44,7 +47,6 @@
 #include <linux/mutex.h>
 #include <linux/usb/audio.h>
 #include <linux/usb/audio-v2.h>
-#include <linux/module.h>
 #include <sound/control.h>
 #include <sound/core.h>
@@ -63,9 +65,9 @@
 #include "helper.h"
 #include "debug.h"
 #include "pcm.h"
+#include "urb.h"
 #include "format.h"
 #include "power.h"
-#include "stream.h"
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -75,13 +77,14 @@ MODULE_SUPPORTED_DEVICE("{{Generic,USB Audio}}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 /* Vendor/product IDs for this card */
 static int vid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
 static int pid[SNDRV_CARDS] = { [0 ... (SNDRV_CARDS-1)] = -1 };
 static int nrpacks = 8;         /* max. number of packets per urb */
+static int async_unlink = 1;
 static int device_setup[SNDRV_CARDS]; /* device parameter for this card */
-static bool ignore_ctl_error;
+static int ignore_ctl_error;
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the USB audio adapter.");
@@ -95,6 +98,8 @@ module_param_array(pid, int, NULL, 0444);
 MODULE_PARM_DESC(pid, "Product ID for the USB audio device.");
 module_param(nrpacks, int, 0644);
 MODULE_PARM_DESC(nrpacks, "Max. number of packets per URB.");
+module_param(async_unlink, bool, 0444);
+MODULE_PARM_DESC(async_unlink, "Use async unlink mode.");
 module_param_array(device_setup, int, NULL, 0444);
 MODULE_PARM_DESC(device_setup, "Specific device setup (if needed).");
 module_param(ignore_ctl_error, bool, 0444);
@@ -125,9 +130,8 @@ static void snd_usb_stream_disconnect(struct list_head *head)
                subs = &as->substream[idx];
                if (!subs->num_formats)
                        continue;
+                snd_usb_release_substream_urbs(subs, 1);
                subs->interface = -1;
-                subs->data_endpoint = NULL;
-                subs->sync_endpoint = NULL;
        }
 }
@@ -181,7 +185,7 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
                return -EINVAL;
        }
-        if (! snd_usb_parse_audio_interface(chip, interface)) {
+        if (! snd_usb_parse_audio_endpoints(chip, interface)) {
                usb_set_interface(dev, interface, 0); /* reset the current interface */
                usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
                return -EINVAL;
@@ -271,7 +275,6 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
 static int snd_usb_audio_free(struct snd_usb_audio *chip)
 {
-        mutex_destroy(&chip->mutex);
        kfree(chip);
        return 0;
 }
@@ -332,19 +335,18 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                return -ENOMEM;
        }
-        mutex_init(&chip->mutex);
+        mutex_init(&chip->shutdown_mutex);
-        init_rwsem(&chip->shutdown_rwsem);
        chip->index = idx;
        chip->dev = dev;
        chip->card = card;
        chip->setup = device_setup[idx];
        chip->nrpacks = nrpacks;
+        chip->async_unlink = async_unlink;
        chip->probing = 1;
        chip->usb_id = USB_ID(le16_to_cpu(dev->descriptor.idVendor),
                              le16_to_cpu(dev->descriptor.idProduct));
        INIT_LIST_HEAD(&chip->pcm_list);
-        INIT_LIST_HEAD(&chip->ep_list);
        INIT_LIST_HEAD(&chip->midi_list);
        INIT_LIST_HEAD(&chip->mixer_list);
@@ -546,17 +548,15 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
                                     struct snd_usb_audio *chip)
 {
        struct snd_card *card;
-        struct list_head *p, *n;
+        struct list_head *p;
        if (chip == (void *)-1L)
                return;
        card = chip->card;
-        down_write(&chip->shutdown_rwsem);
-        chip->shutdown = 1;
-        up_write(&chip->shutdown_rwsem);
        mutex_lock(&register_mutex);
+        mutex_lock(&chip->shutdown_mutex);
+        chip->shutdown = 1;
        chip->num_interfaces--;
        if (chip->num_interfaces <= 0) {
                snd_card_disconnect(card);
@@ -564,10 +564,6 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
                list_for_each(p, &chip->pcm_list) {
                        snd_usb_stream_disconnect(p);
                }
-                /* release the endpoint resources */
-                list_for_each_safe(p, n, &chip->ep_list) {
-                        snd_usb_endpoint_free(p);
-                }
                /* release the midi resources */
                list_for_each(p, &chip->midi_list) {
                        snd_usbmidi_disconnect(p);
@@ -577,9 +573,11 @@ static void snd_usb_audio_disconnect(struct usb_device *dev,
                        snd_usb_mixer_disconnect(p);
                }
                usb_chip[chip->index] = NULL;
+                mutex_unlock(&chip->shutdown_mutex);
                mutex_unlock(&register_mutex);
                snd_card_free_when_closed(card);
        } else {
+                mutex_unlock(&chip->shutdown_mutex);
                mutex_unlock(&register_mutex);
        }
 }
@@ -611,20 +609,16 @@ int snd_usb_autoresume(struct snd_usb_audio *chip)
 {
        int err = -ENODEV;
-        down_read(&chip->shutdown_rwsem);
        if (!chip->shutdown && !chip->probing)
                err = usb_autopm_get_interface(chip->pm_intf);
-        up_read(&chip->shutdown_rwsem);
        return err;
 }
 void snd_usb_autosuspend(struct snd_usb_audio *chip)
 {
-        down_read(&chip->shutdown_rwsem);
        if (!chip->shutdown && !chip->probing)
                usb_autopm_put_interface(chip->pm_intf);
-        up_read(&chip->shutdown_rwsem);
 }
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
@@ -637,14 +631,12 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
        if (chip == (void *)-1L)
                return 0;
-        if (!PMSG_IS_AUTO(message)) {
+        if (!(message.event & PM_EVENT_AUTO)) {
                snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
                if (!chip->num_suspended_intf++) {
                        list_for_each(p, &chip->pcm_list) {
                                as = list_entry(p, struct snd_usb_stream, list);
                                snd_pcm_suspend_all(as->pcm);
-                                as->substream[0].need_setup_ep =
-                                        as->substream[1].need_setup_ep = true;
                        }
                }
        } else {
diff --git a/sound/usb/card.h b/sound/usb/card.h
index 8a751b4887e..ae4251d5abf 100644
--- a/sound/usb/card.h
+++ b/sound/usb/card.h
@@ -1,7 +1,6 @@
 #ifndef __USBAUDIO_CARD_H
 #define __USBAUDIO_CARD_H
-#define MAX_NR_RATES    1024
 #define MAX_PACKS       20
 #define MAX_PACKS_HS    (MAX_PACKS * 8) /* in high speed mode */
 #define MAX_URBS        8
@@ -27,77 +26,23 @@ struct audioformat {
        unsigned int nr_rates;          /* number of rate table entries */
        unsigned int *rate_table;       /* rate table */
        unsigned char clock;            /* associated clock */
-        struct snd_pcm_chmap_elem *chmap; /* (optional) channel map */
 };
 struct snd_usb_substream;
-struct snd_usb_endpoint;
 struct snd_urb_ctx {
        struct urb *urb;
        unsigned int buffer_size;       /* size of data buffer, if data URB */
        struct snd_usb_substream *subs;
-        struct snd_usb_endpoint *ep;
        int index;      /* index for urb array */
        int packets;    /* number of packets per urb */
-        int packet_size[MAX_PACKS_HS]; /* size of packets for next submission */
-        struct list_head ready_list;
 };
-struct snd_usb_endpoint {
+struct snd_urb_ops {
-        struct snd_usb_audio *chip;
+        int (*prepare)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+        int (*retire)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
-        int use_count;
+        int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
-        int ep_num;             /* the referenced endpoint number */
+        int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
-        int type;               /* SND_USB_ENDPOINT_TYPE_* */
-        unsigned long flags;
-        void (*prepare_data_urb) (struct snd_usb_substream *subs,
-                                  struct urb *urb);
-        void (*retire_data_urb) (struct snd_usb_substream *subs,
-                                 struct urb *urb);
-        struct snd_usb_substream *data_subs;
-        struct snd_usb_endpoint *sync_master;
-        struct snd_usb_endpoint *sync_slave;
-        struct snd_urb_ctx urb[MAX_URBS];
-        struct snd_usb_packet_info {
-                uint32_t packet_size[MAX_PACKS_HS];
-                int packets;
-        } next_packet[MAX_URBS];
-        int next_packet_read_pos, next_packet_write_pos;
-        struct list_head ready_playback_urbs;
-        unsigned int nurbs;             /* # urbs */
-        unsigned long active_mask;      /* bitmask of active urbs */
-        unsigned long unlink_mask;      /* bitmask of unlinked urbs */
-        char *syncbuf;                  /* sync buffer for all sync URBs */
-        dma_addr_t sync_dma;            /* DMA address of syncbuf */
-        unsigned int pipe;              /* the data i/o pipe */
-        unsigned int freqn;             /* nominal sampling rate in fs/fps in Q16.16 format */
-        unsigned int freqm;             /* momentary sampling rate in fs/fps in Q16.16 format */
-        int        freqshift;           /* how much to shift the feedback value to get Q16.16 */
-        unsigned int freqmax;           /* maximum sampling rate, used for buffer management */
-        unsigned int phase;             /* phase accumulator */
-        unsigned int maxpacksize;       /* max packet size in bytes */
-        unsigned int maxframesize;      /* max packet size in frames */
-        unsigned int curpacksize;       /* current packet size in bytes (for capture) */
-        unsigned int curframesize;      /* current packet size in frames (for capture) */
-        unsigned int syncmaxsize;       /* sync endpoint packet size */
-        unsigned int fill_max:1;        /* fill max packet size always */
-        unsigned int datainterval;      /* log_2 of data packet interval */
-        unsigned int syncinterval;      /* P for adaptive mode, 0 otherwise */
-        unsigned char silence_value;
-        unsigned int stride;
-        int iface, alt_idx;
-        int skip_packets;               /* quirks for devices to ignore the first n packets
-                                           in a stream */
-        spinlock_t lock;
-        struct list_head list;
 };
 struct snd_usb_substream {
@@ -108,12 +53,24 @@ struct snd_usb_substream {
        int interface;  /* current interface */
        int endpoint;   /* assigned endpoint */
        struct audioformat *cur_audiofmt;       /* current audioformat pointer (for hw_params callback) */
-        snd_pcm_format_t pcm_format;    /* current audio format (for hw_params callback) */
-        unsigned int channels;          /* current number of channels (for hw_params callback) */
-        unsigned int channels_max;      /* max channels in the all audiofmts */
        unsigned int cur_rate;          /* current rate (for hw_params callback) */
        unsigned int period_bytes;      /* current period bytes (for hw_params callback) */
        unsigned int altset_idx;     /* USB data format: index of alternate setting */
+        unsigned int datapipe;   /* the data i/o pipe */
+        unsigned int syncpipe;   /* 1 - async out or adaptive in */
+        unsigned int datainterval;      /* log_2 of data packet interval */
+        unsigned int syncinterval;  /* P for adaptive mode, 0 otherwise */
+        unsigned int freqn;      /* nominal sampling rate in fs/fps in Q16.16 format */
+        unsigned int freqm;      /* momentary sampling rate in fs/fps in Q16.16 format */
+        int          freqshift;  /* how much to shift the feedback value to get Q16.16 */
+        unsigned int freqmax;    /* maximum sampling rate, used for buffer management */
+        unsigned int phase;      /* phase accumulator */
+        unsigned int maxpacksize;       /* max packet size in bytes */
+        unsigned int maxframesize;      /* max packet size in frames */
+        unsigned int curpacksize;       /* current packet size in bytes (for capture) */
+        unsigned int curframesize;      /* current packet size in frames (for capture) */
+        unsigned int syncmaxsize;       /* sync endpoint packet size */
+        unsigned int fill_max: 1;       /* fill max packet size always */
        unsigned int txfr_quirk:1;      /* allow sub-frame alignment */
        unsigned int fmt_type;          /* USB audio format type (1-3) */
@@ -121,14 +78,14 @@ struct snd_usb_substream {
        unsigned int hwptr_done;        /* processed byte position in the buffer */
        unsigned int transfer_done;             /* processed frames since last period update */
+        unsigned long active_mask;      /* bitmask of active urbs */
+        unsigned long unlink_mask;      /* bitmask of unlinked urbs */
-        /* data and sync endpoints for this stream */
+        unsigned int nurbs;                     /* # urbs */
-        unsigned int ep_num;            /* the endpoint number */
+        struct snd_urb_ctx dataurb[MAX_URBS];   /* data urb table */
-        struct snd_usb_endpoint *data_endpoint;
+        struct snd_urb_ctx syncurb[SYNC_URBS];  /* sync urb table */
-        struct snd_usb_endpoint *sync_endpoint;
+        char *syncbuf;                          /* sync buffer for all sync URBs */
-        unsigned long flags;
+        dma_addr_t sync_dma;                    /* DMA address of syncbuf */
-        bool need_setup_ep;             /* (re)configure EP at prepare? */
-        unsigned int speed;             /* USB_SPEED_XXX */
        u64 formats;                    /* format bitmasks (all or'ed) */
        unsigned int num_formats;               /* number of supported audio formats (list) */
@@ -136,8 +93,7 @@ struct snd_usb_substream {
        struct snd_pcm_hw_constraint_list rate_list;    /* limited rates */
        spinlock_t lock;
-        int last_frame_number;          /* stored frame number */
+        struct snd_urb_ops ops;         /* callbacks (must be filled at init) */
-        int last_delay;                 /* stored delay */
 };
 struct snd_usb_stream {
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
index 5e634a2eb28..075195e8661 100644
--- a/sound/usb/clock.c
+++ b/sound/usb/clock.c
@@ -91,7 +91,7 @@ static int uac_clock_selector_get_val(struct snd_usb_audio *chip, int selector_i
                              USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
                              UAC2_CX_CLOCK_SELECTOR << 8,
                              snd_usb_ctrl_intf(chip) | (selector_id << 8),
-                              &buf, sizeof(buf));
+                              &buf, sizeof(buf), 1000);
        if (ret < 0)
                return ret;
@@ -111,15 +111,14 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id)
                return 0;
        /* If a clock source can't tell us whether it's valid, we assume it is */
-        if (!uac2_control_is_readable(cs_desc->bmControls,
+        if (!uac2_control_is_readable(cs_desc->bmControls, UAC2_CS_CONTROL_CLOCK_VALID))
-                                      UAC2_CS_CONTROL_CLOCK_VALID - 1))
                return 1;
        err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
                              USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
                              UAC2_CS_CONTROL_CLOCK_VALID << 8,
                              snd_usb_ctrl_intf(chip) | (source_id << 8),
-                              &data, sizeof(data));
+                              &data, sizeof(data), 1000);
        if (err < 0) {
                snd_printk(KERN_WARNING "%s(): cannot get clock validity for id %d\n",
@@ -223,7 +222,7 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
        if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
                                   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT,
                                   UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
-                                   data, sizeof(data))) < 0) {
+                                   data, sizeof(data), 1000)) < 0) {
                snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d to ep %#x\n",
                           dev->devnum, iface, fmt->altsetting, rate, ep);
                return err;
@@ -232,7 +231,7 @@ static int set_sample_rate_v1(struct snd_usb_audio *chip, int iface,
        if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC_GET_CUR,
                                   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_IN,
                                   UAC_EP_CS_ATTR_SAMPLE_RATE << 8, ep,
-                                   data, sizeof(data))) < 0) {
+                                   data, sizeof(data), 1000)) < 0) {
                snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq at ep %#x\n",
                           dev->devnum, iface, fmt->altsetting, ep);
                return 0; /* some devices don't support reading */
@@ -274,7 +273,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
                                   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
                                   UAC2_CS_CONTROL_SAM_FREQ << 8,
                                   snd_usb_ctrl_intf(chip) | (clock << 8),
-                                   data, sizeof(data))) < 0) {
+                                   data, sizeof(data), 1000)) < 0) {
                snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n",
                           dev->devnum, iface, fmt->altsetting, rate);
                return err;
@@ -284,7 +283,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
                                   USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
                                   UAC2_CS_CONTROL_SAM_FREQ << 8,
                                   snd_usb_ctrl_intf(chip) | (clock << 8),
-                                   data, sizeof(data))) < 0) {
+                                   data, sizeof(data), 1000)) < 0) {
                snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",
                           dev->devnum, iface, fmt->altsetting);
                return err;
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 21049b882ee..7d46e482375 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -15,1097 +15,436 @@
 *
 */
-#include <linux/gfp.h>
 #include <linux/init.h>
-#include <linux/ratelimit.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
-#include <linux/slab.h>
+#include <linux/usb/audio-v2.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
-#include <sound/pcm_params.h>
 #include "usbaudio.h"
-#include "helper.h"
 #include "card.h"
+#include "proc.h"
+#include "quirks.h"
 #include "endpoint.h"
+#include "urb.h"
 #include "pcm.h"
-#include "quirks.h"
+#include "helper.h"
+#include "format.h"
-#define EP_FLAG_ACTIVATED       0
+#include "clock.h"
-#define EP_FLAG_RUNNING         1
-#define EP_FLAG_STOPPING        2
-/*
- * snd_usb_endpoint is a model that abstracts everything related to an
- * USB endpoint and its streaming.
- *
- * There are functions to activate and deactivate the streaming URBs and
- * optional callbacks to let the pcm logic handle the actual content of the
- * packets for playback and record. Thus, the bus streaming and the audio
- * handlers are fully decoupled.
- *
- * There are two different types of endpoints in audio applications.
- *
- * SND_USB_ENDPOINT_TYPE_DATA handles full audio data payload for both
- * inbound and outbound traffic.
- *
- * SND_USB_ENDPOINT_TYPE_SYNC endpoints are for inbound traffic only and
- * expect the payload to carry Q10.14 / Q16.16 formatted sync information
- * (3 or 4 bytes).
- *
- * Each endpoint has to be configured prior to being used by calling
- * snd_usb_endpoint_set_params().
- *
- * The model incorporates a reference counting, so that multiple users
- * can call snd_usb_endpoint_start() and snd_usb_endpoint_stop(), and
- * only the first user will effectively start the URBs, and only the last
- * one to stop it will tear the URBs down again.
- */
-/*
- * convert a sampling rate into our full speed format (fs/1000 in Q16.16)
- * this will overflow at approx 524 kHz
- */
-static inline unsigned get_usb_full_speed_rate(unsigned int rate)
-{
-        return ((rate << 13) + 62) / 125;
-}
-/*
- * convert a sampling rate into USB high speed format (fs/8000 in Q16.16)
- * this will overflow at approx 4 MHz
- */
-static inline unsigned get_usb_high_speed_rate(unsigned int rate)
-{
-        return ((rate << 10) + 62) / 125;
-}
 /*
- * release a urb data
+ * free a substream
 */
-static void release_urb_ctx(struct snd_urb_ctx *u)
+static void free_substream(struct snd_usb_substream *subs)
-{
-        if (u->buffer_size)
-                usb_free_coherent(u->ep->chip->dev, u->buffer_size,
-                                  u->urb->transfer_buffer,
-                                  u->urb->transfer_dma);
-        usb_free_urb(u->urb);
-        u->urb = NULL;
-}
-static const char *usb_error_string(int err)
 {
-        switch (err) {
+        struct list_head *p, *n;
-        case -ENODEV:
-                return "no device";
+        if (!subs->num_formats)
-        case -ENOENT:
+                return; /* not initialized */
-                return "endpoint not enabled";
+        list_for_each_safe(p, n, &subs->fmt_list) {
-        case -EPIPE:
+                struct audioformat *fp = list_entry(p, struct audioformat, list);
-                return "endpoint stalled";
+                kfree(fp->rate_table);
-        case -ENOSPC:
+                kfree(fp);
-                return "not enough bandwidth";
-        case -ESHUTDOWN:
-                return "device disabled";
-        case -EHOSTUNREACH:
-                return "device suspended";
-        case -EINVAL:
-        case -EAGAIN:
-        case -EFBIG:
-        case -EMSGSIZE:
-                return "internal error";
-        default:
-                return "unknown error";
        }
+        kfree(subs->rate_list.list);
 }
-/**
- * snd_usb_endpoint_implicit_feedback_sink: Report endpoint usage type
- *
- * @ep: The snd_usb_endpoint
- *
- * Determine whether an endpoint is driven by an implicit feedback
- * data endpoint source.
- */
-int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep)
-{
-        return  ep->sync_master &&
-                ep->sync_master->type == SND_USB_ENDPOINT_TYPE_DATA &&
-                ep->type == SND_USB_ENDPOINT_TYPE_DATA &&
-                usb_pipeout(ep->pipe);
-}
 /*
- * For streaming based on information derived from sync endpoints,
+ * free a usb stream instance
- * prepare_outbound_urb_sizes() will call next_packet_size() to
- * determine the number of samples to be sent in the next packet.
- *
- * For implicit feedback, next_packet_size() is unused.
 */
-int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep)
+static void snd_usb_audio_stream_free(struct snd_usb_stream *stream)
 {
-        unsigned long flags;
+        free_substream(&stream->substream[0]);
-        int ret;
+        free_substream(&stream->substream[1]);
+        list_del(&stream->list);
-        if (ep->fill_max)
+        kfree(stream);
-                return ep->maxframesize;
-        spin_lock_irqsave(&ep->lock, flags);
-        ep->phase = (ep->phase & 0xffff)
-                + (ep->freqm << ep->datainterval);
-        ret = min(ep->phase >> 16, ep->maxframesize);
-        spin_unlock_irqrestore(&ep->lock, flags);
-        return ret;
 }
-static void retire_outbound_urb(struct snd_usb_endpoint *ep,
+static void snd_usb_audio_pcm_free(struct snd_pcm *pcm)
-                                struct snd_urb_ctx *urb_ctx)
 {
-        if (ep->retire_data_urb)
+        struct snd_usb_stream *stream = pcm->private_data;
-                ep->retire_data_urb(ep->data_subs, urb_ctx->urb);
+        if (stream) {
-}
+                stream->pcm = NULL;
+                snd_usb_audio_stream_free(stream);
-static void retire_inbound_urb(struct snd_usb_endpoint *ep,
-                               struct snd_urb_ctx *urb_ctx)
-{
-        struct urb *urb = urb_ctx->urb;
-        if (unlikely(ep->skip_packets > 0)) {
-                ep->skip_packets--;
-                return;
        }
-        if (ep->sync_slave)
-                snd_usb_handle_sync_urb(ep->sync_slave, ep, urb);
-        if (ep->retire_data_urb)
-                ep->retire_data_urb(ep->data_subs, urb);
 }
-/*
- * Prepare a PLAYBACK urb for submission to the bus.
- */
-static void prepare_outbound_urb(struct snd_usb_endpoint *ep,
-                                 struct snd_urb_ctx *ctx)
-{
-        int i;
-        struct urb *urb = ctx->urb;
-        unsigned char *cp = urb->transfer_buffer;
-        urb->dev = ep->chip->dev; /* we need to set this at each time */
-        switch (ep->type) {
-        case SND_USB_ENDPOINT_TYPE_DATA:
-                if (ep->prepare_data_urb) {
-                        ep->prepare_data_urb(ep->data_subs, urb);
-                } else {
-                        /* no data provider, so send silence */
-                        unsigned int offs = 0;
-                        for (i = 0; i < ctx->packets; ++i) {
-                                int counts;
-                                if (ctx->packet_size[i])
-                                        counts = ctx->packet_size[i];
-                                else
-                                        counts = snd_usb_endpoint_next_packet_size(ep);
-                                urb->iso_frame_desc[i].offset = offs * ep->stride;
-                                urb->iso_frame_desc[i].length = counts * ep->stride;
-                                offs += counts;
-                        }
-                        urb->number_of_packets = ctx->packets;
-                        urb->transfer_buffer_length = offs * ep->stride;
-                        memset(urb->transfer_buffer, ep->silence_value,
-                               offs * ep->stride);
-                }
-                break;
-        case SND_USB_ENDPOINT_TYPE_SYNC:
-                if (snd_usb_get_speed(ep->chip->dev) >= USB_SPEED_HIGH) {
-                        /*
-                         * fill the length and offset of each urb descriptor.
-                         * the fixed 12.13 frequency is passed as 16.16 through the pipe.
-                         */
-                        urb->iso_frame_desc[0].length = 4;
-                        urb->iso_frame_desc[0].offset = 0;
-                        cp[0] = ep->freqn;
-                        cp[1] = ep->freqn >> 8;
-                        cp[2] = ep->freqn >> 16;
-                        cp[3] = ep->freqn >> 24;
-                } else {
-                        /*
-                         * fill the length and offset of each urb descriptor.
-                         * the fixed 10.14 frequency is passed through the pipe.
-                         */
-                        urb->iso_frame_desc[0].length = 3;
-                        urb->iso_frame_desc[0].offset = 0;
-                        cp[0] = ep->freqn >> 2;
-                        cp[1] = ep->freqn >> 10;
-                        cp[2] = ep->freqn >> 18;
-                }
-                break;
-        }
-}
 /*
- * Prepare a CAPTURE or SYNC urb for submission to the bus.
+ * add this endpoint to the chip instance.
+ * if a stream with the same endpoint already exists, append to it.
+ * if not, create a new pcm stream.
 */
-static inline void prepare_inbound_urb(struct snd_usb_endpoint *ep,
+int snd_usb_add_audio_endpoint(struct snd_usb_audio *chip, int stream, struct audioformat *fp)
-                                       struct snd_urb_ctx *urb_ctx)
 {
-        int i, offs;
+        struct list_head *p;
-        struct urb *urb = urb_ctx->urb;
+        struct snd_usb_stream *as;
+        struct snd_usb_substream *subs;
-        urb->dev = ep->chip->dev; /* we need to set this at each time */
+        struct snd_pcm *pcm;
+        int err;
-        switch (ep->type) {
+        list_for_each(p, &chip->pcm_list) {
-        case SND_USB_ENDPOINT_TYPE_DATA:
+                as = list_entry(p, struct snd_usb_stream, list);
-                offs = 0;
+                if (as->fmt_type != fp->fmt_type)
-                for (i = 0; i < urb_ctx->packets; i++) {
+                        continue;
-                        urb->iso_frame_desc[i].offset = offs;
+                subs = &as->substream[stream];
-                        urb->iso_frame_desc[i].length = ep->curpacksize;
+                if (!subs->endpoint)
-                        offs += ep->curpacksize;
+                        continue;
+                if (subs->endpoint == fp->endpoint) {
+                        list_add_tail(&fp->list, &subs->fmt_list);
+                        subs->num_formats++;
+                        subs->formats |= fp->formats;
+                        return 0;
                }
-                urb->transfer_buffer_length = offs;
-                urb->number_of_packets = urb_ctx->packets;
-                break;
-        case SND_USB_ENDPOINT_TYPE_SYNC:
-                urb->iso_frame_desc[0].length = min(4u, ep->syncmaxsize);
-                urb->iso_frame_desc[0].offset = 0;
-                break;
        }
-}
+        /* look for an empty stream */
+        list_for_each(p, &chip->pcm_list) {
-/*
+                as = list_entry(p, struct snd_usb_stream, list);
- * Send output urbs that have been prepared previously. URBs are dequeued
+                if (as->fmt_type != fp->fmt_type)
- * from ep->ready_playback_urbs and in case there there aren't any available
+                        continue;
- * or there are no packets that have been prepared, this function does
+                subs = &as->substream[stream];
- * nothing.
+                if (subs->endpoint)
- *
+                        continue;
- * The reason why the functionality of sending and preparing URBs is separated
+                err = snd_pcm_new_stream(as->pcm, stream, 1);
- * is that host controllers don't guarantee the order in which they return
- * inbound and outbound packets to their submitters.
- *
- * This function is only used for implicit feedback endpoints. For endpoints
- * driven by dedicated sync endpoints, URBs are immediately re-submitted
- * from their completion handler.
- */
-static void queue_pending_output_urbs(struct snd_usb_endpoint *ep)
-{
-        while (test_bit(EP_FLAG_RUNNING, &ep->flags)) {
-                unsigned long flags;
-                struct snd_usb_packet_info *uninitialized_var(packet);
-                struct snd_urb_ctx *ctx = NULL;
-                struct urb *urb;
-                int err, i;
-                spin_lock_irqsave(&ep->lock, flags);
-                if (ep->next_packet_read_pos != ep->next_packet_write_pos) {
-                        packet = ep->next_packet + ep->next_packet_read_pos;
-                        ep->next_packet_read_pos++;
-                        ep->next_packet_read_pos %= MAX_URBS;
-                        /* take URB out of FIFO */
-                        if (!list_empty(&ep->ready_playback_urbs))
-                                ctx = list_first_entry(&ep->ready_playback_urbs,
-                                               struct snd_urb_ctx, ready_list);
-                }
-                spin_unlock_irqrestore(&ep->lock, flags);
-                if (ctx == NULL)
-                        return;
-                list_del_init(&ctx->ready_list);
-                urb = ctx->urb;
-                /* copy over the length information */
-                for (i = 0; i < packet->packets; i++)
-                        ctx->packet_size[i] = packet->packet_size[i];
-                /* call the data handler to fill in playback data */
-                prepare_outbound_urb(ep, ctx);
-                err = usb_submit_urb(ctx->urb, GFP_ATOMIC);
                if (err < 0)
-                        snd_printk(KERN_ERR "Unable to submit urb #%d: %d (urb %p)\n",
+                        return err;
-                                   ctx->index, err, ctx->urb);
+                snd_usb_init_substream(as, stream, fp);
-                else
+                return 0;
-                        set_bit(ctx->index, &ep->active_mask);
-        }
-}
-/*
- * complete callback for urbs
- */
-static void snd_complete_urb(struct urb *urb)
-{
-        struct snd_urb_ctx *ctx = urb->context;
-        struct snd_usb_endpoint *ep = ctx->ep;
-        int err;
-        if (unlikely(urb->status == -ENOENT ||          /* unlinked */
-                     urb->status == -ENODEV ||          /* device removed */
-                     urb->status == -ECONNRESET ||      /* unlinked */
-                     urb->status == -ESHUTDOWN ||       /* device disabled */
-                     ep->chip->shutdown))               /* device disconnected */
-                goto exit_clear;
-        if (usb_pipeout(ep->pipe)) {
-                retire_outbound_urb(ep, ctx);
-                /* can be stopped during retire callback */
-                if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))
-                        goto exit_clear;
-                if (snd_usb_endpoint_implict_feedback_sink(ep)) {
-                        unsigned long flags;
-                        spin_lock_irqsave(&ep->lock, flags);
-                        list_add_tail(&ctx->ready_list, &ep->ready_playback_urbs);
-                        spin_unlock_irqrestore(&ep->lock, flags);
-                        queue_pending_output_urbs(ep);
-                        goto exit_clear;
-                }
-                prepare_outbound_urb(ep, ctx);
-        } else {
-                retire_inbound_urb(ep, ctx);
-                /* can be stopped during retire callback */
-                if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags)))
-                        goto exit_clear;
-                prepare_inbound_urb(ep, ctx);
        }
-        err = usb_submit_urb(urb, GFP_ATOMIC);
+        /* create a new pcm */
-        if (err == 0)
+        as = kzalloc(sizeof(*as), GFP_KERNEL);
-                return;
+        if (!as)
+                return -ENOMEM;
-        snd_printk(KERN_ERR "cannot submit urb (err = %d)\n", err);
+        as->pcm_index = chip->pcm_devs;
-        //snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+        as->chip = chip;
+        as->fmt_type = fp->fmt_type;
-exit_clear:
+        err = snd_pcm_new(chip->card, "USB Audio", chip->pcm_devs,
-        clear_bit(ctx->index, &ep->active_mask);
+                          stream == SNDRV_PCM_STREAM_PLAYBACK ? 1 : 0,
-}
+                          stream == SNDRV_PCM_STREAM_PLAYBACK ? 0 : 1,
+                          &pcm);
-/**
+        if (err < 0) {
- * snd_usb_add_endpoint: Add an endpoint to an USB audio chip
+                kfree(as);
- *
+                return err;
- * @chip: The chip
- * @alts: The USB host interface
- * @ep_num: The number of the endpoint to use
- * @direction: SNDRV_PCM_STREAM_PLAYBACK or SNDRV_PCM_STREAM_CAPTURE
- * @type: SND_USB_ENDPOINT_TYPE_DATA or SND_USB_ENDPOINT_TYPE_SYNC
- *
- * If the requested endpoint has not been added to the given chip before,
- * a new instance is created. Otherwise, a pointer to the previoulsy
- * created instance is returned. In case of any error, NULL is returned.
- *
- * New endpoints will be added to chip->ep_list and must be freed by
- * calling snd_usb_endpoint_free().
- */
-struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
-                                              struct usb_host_interface *alts,
-                                              int ep_num, int direction, int type)
-{
-        struct list_head *p;
-        struct snd_usb_endpoint *ep;
-        int is_playback = direction == SNDRV_PCM_STREAM_PLAYBACK;
-        mutex_lock(&chip->mutex);
-        list_for_each(p, &chip->ep_list) {
-                ep = list_entry(p, struct snd_usb_endpoint, list);
-                if (ep->ep_num == ep_num &&
-                    ep->iface == alts->desc.bInterfaceNumber &&
-                    ep->alt_idx == alts->desc.bAlternateSetting) {
-                        snd_printdd(KERN_DEBUG "Re-using EP %x in iface %d,%d @%p\n",
-                                        ep_num, ep->iface, ep->alt_idx, ep);
-                        goto __exit_unlock;
-                }
        }
+        as->pcm = pcm;
-        snd_printdd(KERN_DEBUG "Creating new %s %s endpoint #%x\n",
+        pcm->private_data = as;
-                    is_playback ? "playback" : "capture",
+        pcm->private_free = snd_usb_audio_pcm_free;
-                    type == SND_USB_ENDPOINT_TYPE_DATA ? "data" : "sync",
+        pcm->info_flags = 0;
-                    ep_num);
+        if (chip->pcm_devs > 0)
+                sprintf(pcm->name, "USB Audio #%d", chip->pcm_devs);
-        ep = kzalloc(sizeof(*ep), GFP_KERNEL);
-        if (!ep)
-                goto __exit_unlock;
-        ep->chip = chip;
-        spin_lock_init(&ep->lock);
-        ep->type = type;
-        ep->ep_num = ep_num;
-        ep->iface = alts->desc.bInterfaceNumber;
-        ep->alt_idx = alts->desc.bAlternateSetting;
-        INIT_LIST_HEAD(&ep->ready_playback_urbs);
-        ep_num &= USB_ENDPOINT_NUMBER_MASK;
-        if (is_playback)
-                ep->pipe = usb_sndisocpipe(chip->dev, ep_num);
        else
-                ep->pipe = usb_rcvisocpipe(chip->dev, ep_num);
+                strcpy(pcm->name, "USB Audio");
-        if (type == SND_USB_ENDPOINT_TYPE_SYNC) {
-                if (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
-                    get_endpoint(alts, 1)->bRefresh >= 1 &&
-                    get_endpoint(alts, 1)->bRefresh <= 9)
-                        ep->syncinterval = get_endpoint(alts, 1)->bRefresh;
-                else if (snd_usb_get_speed(chip->dev) == USB_SPEED_FULL)
-                        ep->syncinterval = 1;
-                else if (get_endpoint(alts, 1)->bInterval >= 1 &&
-                         get_endpoint(alts, 1)->bInterval <= 16)
-                        ep->syncinterval = get_endpoint(alts, 1)->bInterval - 1;
-                else
-                        ep->syncinterval = 3;
-                ep->syncmaxsize = le16_to_cpu(get_endpoint(alts, 1)->wMaxPacketSize);
+        snd_usb_init_substream(as, stream, fp);
-        }
-        list_add_tail(&ep->list, &chip->ep_list);
-__exit_unlock:
+        list_add(&as->list, &chip->pcm_list);
-        mutex_unlock(&chip->mutex);
+        chip->pcm_devs++;
-        return ep;
+        snd_usb_proc_pcm_format_add(as);
-}
-/*
- *  wait until all urbs are processed.
- */
-static int wait_clear_urbs(struct snd_usb_endpoint *ep)
-{
-        unsigned long end_time = jiffies + msecs_to_jiffies(1000);
-        int alive;
-        do {
-                alive = bitmap_weight(&ep->active_mask, ep->nurbs);
-                if (!alive)
-                        break;
-                schedule_timeout_uninterruptible(1);
-        } while (time_before(jiffies, end_time));
-        if (alive)
-                snd_printk(KERN_ERR "timeout: still %d active urbs on EP #%x\n",
-                                        alive, ep->ep_num);
-        clear_bit(EP_FLAG_STOPPING, &ep->flags);
        return 0;
 }
-/* sync the pending stop operation;
+static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip,
- * this function itself doesn't trigger the stop operation
+                                         struct usb_host_interface *alts,
- */
+                                         int protocol, int iface_no)
-void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep)
-{
-        if (ep && test_bit(EP_FLAG_STOPPING, &ep->flags))
-                wait_clear_urbs(ep);
-}
-/*
- * unlink active urbs.
- */
-static int deactivate_urbs(struct snd_usb_endpoint *ep, bool force)
-{
-        unsigned int i;
-        if (!force && ep->chip->shutdown) /* to be sure... */
-                return -EBADFD;
-        clear_bit(EP_FLAG_RUNNING, &ep->flags);
-        INIT_LIST_HEAD(&ep->ready_playback_urbs);
-        ep->next_packet_read_pos = 0;
-        ep->next_packet_write_pos = 0;
-        for (i = 0; i < ep->nurbs; i++) {
-                if (test_bit(i, &ep->active_mask)) {
-                        if (!test_and_set_bit(i, &ep->unlink_mask)) {
-                                struct urb *u = ep->urb[i].urb;
-                                usb_unlink_urb(u);
-                        }
-                }
-        }
-        return 0;
-}
-/*
- * release an endpoint's urbs
- */
-static void release_urbs(struct snd_usb_endpoint *ep, int force)
-{
-        int i;
-        /* route incoming urbs to nirvana */
-        ep->retire_data_urb = NULL;
-        ep->prepare_data_urb = NULL;
-        /* stop urbs */
-        deactivate_urbs(ep, force);
-        wait_clear_urbs(ep);
-        for (i = 0; i < ep->nurbs; i++)
-                release_urb_ctx(&ep->urb[i]);
-        if (ep->syncbuf)
-                usb_free_coherent(ep->chip->dev, SYNC_URBS * 4,
-                                  ep->syncbuf, ep->sync_dma);
-        ep->syncbuf = NULL;
-        ep->nurbs = 0;
-}
-/*
- * configure a data endpoint
- */
-static int data_ep_set_params(struct snd_usb_endpoint *ep,
-                              snd_pcm_format_t pcm_format,
-                              unsigned int channels,
-                              unsigned int period_bytes,
-                              struct audioformat *fmt,
-                              struct snd_usb_endpoint *sync_ep)
 {
-        unsigned int maxsize, i, urb_packs, total_packs, packs_per_ms;
+        /* parsed with a v1 header here. that's ok as we only look at the
-        int is_playback = usb_pipeout(ep->pipe);
+         * header first which is the same for both versions */
-        int frame_bits = snd_pcm_format_physical_width(pcm_format) * channels;
+        struct uac_iso_endpoint_descriptor *csep;
+        struct usb_interface_descriptor *altsd = get_iface_desc(alts);
-        ep->datainterval = fmt->datainterval;
+        int attributes = 0;
-        ep->stride = frame_bits >> 3;
-        ep->silence_value = pcm_format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0;
+        csep = snd_usb_find_desc(alts->endpoint[0].extra, alts->endpoint[0].extralen, NULL, USB_DT_CS_ENDPOINT);
-        /* calculate max. frequency */
+        /* Creamware Noah has this descriptor after the 2nd endpoint */
-        if (ep->maxpacksize) {
+        if (!csep && altsd->bNumEndpoints >= 2)
-                /* whatever fits into a max. size packet */
+                csep = snd_usb_find_desc(alts->endpoint[1].extra, alts->endpoint[1].extralen, NULL, USB_DT_CS_ENDPOINT);
-                maxsize = ep->maxpacksize;
-                ep->freqmax = (maxsize / (frame_bits >> 3))
+        if (!csep || csep->bLength < 7 ||
-                                << (16 - ep->datainterval);
+            csep->bDescriptorSubtype != UAC_EP_GENERAL) {
-        } else {
+                snd_printk(KERN_WARNING "%d:%u:%d : no or invalid"
-                /* no max. packet size: just take 25% higher than nominal */
+                           " class specific endpoint descriptor\n",
-                ep->freqmax = ep->freqn + (ep->freqn >> 2);
+                           chip->dev->devnum, iface_no,
-                maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3))
+                           altsd->bAlternateSetting);
-                                >> (16 - ep->datainterval);
+                return 0;
-        }
-        if (ep->fill_max)
-                ep->curpacksize = ep->maxpacksize;
-        else
-                ep->curpacksize = maxsize;
-        if (snd_usb_get_speed(ep->chip->dev) != USB_SPEED_FULL)
-                packs_per_ms = 8 >> ep->datainterval;
-        else
-                packs_per_ms = 1;
-        if (is_playback && !snd_usb_endpoint_implict_feedback_sink(ep)) {
-                urb_packs = max(ep->chip->nrpacks, 1);
-                urb_packs = min(urb_packs, (unsigned int) MAX_PACKS);
-        } else {
-                urb_packs = 1;
        }
-        urb_packs *= packs_per_ms;
+        if (protocol == UAC_VERSION_1) {
+                attributes = csep->bmAttributes;
-        if (sync_ep && !snd_usb_endpoint_implict_feedback_sink(ep))
-                urb_packs = min(urb_packs, 1U << sync_ep->syncinterval);
-        /* decide how many packets to be used */
-        if (is_playback && !snd_usb_endpoint_implict_feedback_sink(ep)) {
-                unsigned int minsize, maxpacks;
-                /* determine how small a packet can be */
-                minsize = (ep->freqn >> (16 - ep->datainterval))
-                          * (frame_bits >> 3);
-                /* with sync from device, assume it can be 12% lower */
-                if (sync_ep)
-                        minsize -= minsize >> 3;
-                minsize = max(minsize, 1u);
-                total_packs = (period_bytes + minsize - 1) / minsize;
-                /* we need at least two URBs for queueing */
-                if (total_packs < 2) {
-                        total_packs = 2;
-                } else {
-                        /* and we don't want too long a queue either */
-                        maxpacks = max(MAX_QUEUE * packs_per_ms, urb_packs * 2);
-                        total_packs = min(total_packs, maxpacks);
-                }
        } else {
-                while (urb_packs > 1 && urb_packs * maxsize >= period_bytes)
+                struct uac2_iso_endpoint_descriptor *csep2 =
-                        urb_packs >>= 1;
+                        (struct uac2_iso_endpoint_descriptor *) csep;
-                total_packs = MAX_URBS * urb_packs;
-        }
-        ep->nurbs = (total_packs + urb_packs - 1) / urb_packs;
+                attributes = csep->bmAttributes & UAC_EP_CS_ATTR_FILL_MAX;
-        if (ep->nurbs > MAX_URBS) {
-                /* too much... */
-                ep->nurbs = MAX_URBS;
-                total_packs = MAX_URBS * urb_packs;
-        } else if (ep->nurbs < 2) {
-                /* too little - we need at least two packets
-                 * to ensure contiguous playback/capture
-                 */
-                ep->nurbs = 2;
-        }
-        /* allocate and initialize data urbs */
-        for (i = 0; i < ep->nurbs; i++) {
-                struct snd_urb_ctx *u = &ep->urb[i];
-                u->index = i;
-                u->ep = ep;
-                u->packets = (i + 1) * total_packs / ep->nurbs
-                        - i * total_packs / ep->nurbs;
-                u->buffer_size = maxsize * u->packets;
-                if (fmt->fmt_type == UAC_FORMAT_TYPE_II)
+                /* emulate the endpoint attributes of a v1 device */
-                        u->packets++; /* for transfer delimiter */
+                if (csep2->bmControls & UAC2_CONTROL_PITCH)
-                u->urb = usb_alloc_urb(u->packets, GFP_KERNEL);
+                        attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL;
-                if (!u->urb)
-                        goto out_of_memory;
-                u->urb->transfer_buffer =
-                        usb_alloc_coherent(ep->chip->dev, u->buffer_size,
-                                           GFP_KERNEL, &u->urb->transfer_dma);
-                if (!u->urb->transfer_buffer)
-                        goto out_of_memory;
-                u->urb->pipe = ep->pipe;
-                u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP;
-                u->urb->interval = 1 << ep->datainterval;
-                u->urb->context = u;
-                u->urb->complete = snd_complete_urb;
-                INIT_LIST_HEAD(&u->ready_list);
        }
-        return 0;
+        return attributes;
-out_of_memory:
-        release_urbs(ep, 0);
-        return -ENOMEM;
 }
-/*
+static struct uac2_input_terminal_descriptor *
- * configure a sync endpoint
+        snd_usb_find_input_terminal_descriptor(struct usb_host_interface *ctrl_iface,
- */
+                                               int terminal_id)
-static int sync_ep_set_params(struct snd_usb_endpoint *ep,
-                              struct audioformat *fmt)
 {
-        int i;
+        struct uac2_input_terminal_descriptor *term = NULL;
-        ep->syncbuf = usb_alloc_coherent(ep->chip->dev, SYNC_URBS * 4,
-                                         GFP_KERNEL, &ep->sync_dma);
-        if (!ep->syncbuf)
-                return -ENOMEM;
-        for (i = 0; i < SYNC_URBS; i++) {
+        while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
-                struct snd_urb_ctx *u = &ep->urb[i];
+                                               ctrl_iface->extralen,
-                u->index = i;
+                                               term, UAC_INPUT_TERMINAL))) {
-                u->ep = ep;
+                if (term->bTerminalID == terminal_id)
-                u->packets = 1;
+                        return term;
-                u->urb = usb_alloc_urb(1, GFP_KERNEL);
-                if (!u->urb)
-                        goto out_of_memory;
-                u->urb->transfer_buffer = ep->syncbuf + i * 4;
-                u->urb->transfer_dma = ep->sync_dma + i * 4;
-                u->urb->transfer_buffer_length = 4;
-                u->urb->pipe = ep->pipe;
-                u->urb->transfer_flags = URB_ISO_ASAP |
-                                         URB_NO_TRANSFER_DMA_MAP;
-                u->urb->number_of_packets = 1;
-                u->urb->interval = 1 << ep->syncinterval;
-                u->urb->context = u;
-                u->urb->complete = snd_complete_urb;
        }
-        ep->nurbs = SYNC_URBS;
+        return NULL;
-        return 0;
-out_of_memory:
-        release_urbs(ep, 0);
-        return -ENOMEM;
 }
-/**
+static struct uac2_output_terminal_descriptor *
- * snd_usb_endpoint_set_params: configure an snd_usb_endpoint
+        snd_usb_find_output_terminal_descriptor(struct usb_host_interface *ctrl_iface,
- *
+                                                int terminal_id)
- * @ep: the snd_usb_endpoint to configure
- * @pcm_format: the audio fomat.
- * @channels: the number of audio channels.
- * @period_bytes: the number of bytes in one alsa period.
- * @rate: the frame rate.
- * @fmt: the USB audio format information
- * @sync_ep: the sync endpoint to use, if any
- *
- * Determine the number of URBs to be used on this endpoint.
- * An endpoint must be configured before it can be started.
- * An endpoint that is already running can not be reconfigured.
- */
-int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
-                                snd_pcm_format_t pcm_format,
-                                unsigned int channels,
-                                unsigned int period_bytes,
-                                unsigned int rate,
-                                struct audioformat *fmt,
-                                struct snd_usb_endpoint *sync_ep)
 {
-        int err;
+        struct uac2_output_terminal_descriptor *term = NULL;
-        if (ep->use_count != 0) {
+        while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
-                snd_printk(KERN_WARNING "Unable to change format on ep #%x: already in use\n",
+                                               ctrl_iface->extralen,
-                           ep->ep_num);
+                                               term, UAC_OUTPUT_TERMINAL))) {
-                return -EBUSY;
+                if (term->bTerminalID == terminal_id)
+                        return term;
        }
-        /* release old buffers, if any */
+        return NULL;
-        release_urbs(ep, 0);
-        ep->datainterval = fmt->datainterval;
-        ep->maxpacksize = fmt->maxpacksize;
-        ep->fill_max = !!(fmt->attributes & UAC_EP_CS_ATTR_FILL_MAX);
-        if (snd_usb_get_speed(ep->chip->dev) == USB_SPEED_FULL)
-                ep->freqn = get_usb_full_speed_rate(rate);
-        else
-                ep->freqn = get_usb_high_speed_rate(rate);
-        /* calculate the frequency in 16.16 format */
-        ep->freqm = ep->freqn;
-        ep->freqshift = INT_MIN;
-        ep->phase = 0;
-        switch (ep->type) {
-        case  SND_USB_ENDPOINT_TYPE_DATA:
-                err = data_ep_set_params(ep, pcm_format, channels,
-                                         period_bytes, fmt, sync_ep);
-                break;
-        case  SND_USB_ENDPOINT_TYPE_SYNC:
-                err = sync_ep_set_params(ep, fmt);
-                break;
-        default:
-                err = -EINVAL;
-        }
-        snd_printdd(KERN_DEBUG "Setting params for ep #%x (type %d, %d urbs), ret=%d\n",
-                   ep->ep_num, ep->type, ep->nurbs, err);
-        return err;
 }
-/**
+int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
- * snd_usb_endpoint_start: start an snd_usb_endpoint
- *
- * @ep:         the endpoint to start
- * @can_sleep:  flag indicating whether the operation is executed in
- *              non-atomic context
- *
- * A call to this function will increment the use count of the endpoint.
- * In case it is not already running, the URBs for this endpoint will be
- * submitted. Otherwise, this function does nothing.
- *
- * Must be balanced to calls of snd_usb_endpoint_stop().
- *
- * Returns an error if the URB submission failed, 0 in all other cases.
- */
-int snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep)
 {
-        int err;
+        struct usb_device *dev;
-        unsigned int i;
+        struct usb_interface *iface;
+        struct usb_host_interface *alts;
+        struct usb_interface_descriptor *altsd;
+        int i, altno, err, stream;
+        int format = 0, num_channels = 0;
+        struct audioformat *fp = NULL;
+        int num, protocol, clock = 0;
+        struct uac_format_type_i_continuous_descriptor *fmt;
-        if (ep->chip->shutdown)
+        dev = chip->dev;
-                return -EBADFD;
-        /* already running? */
+        /* parse the interface's altsettings */
-        if (++ep->use_count != 1)
+        iface = usb_ifnum_to_if(dev, iface_no);
-                return 0;
-        /* just to be sure */
+        num = iface->num_altsetting;
-        deactivate_urbs(ep, false);
-        if (can_sleep)
-                wait_clear_urbs(ep);
-        ep->active_mask = 0;
-        ep->unlink_mask = 0;
-        ep->phase = 0;
-        snd_usb_endpoint_start_quirk(ep);
        /*
-         * If this endpoint has a data endpoint as implicit feedback source,
+         * Dallas DS4201 workaround: It presents 5 altsettings, but the last
-         * don't start the urbs here. Instead, mark them all as available,
+         * one misses syncpipe, and does not produce any sound.
-         * wait for the record urbs to return and queue the playback urbs
-         * from that context.
         */
+        if (chip->usb_id == USB_ID(0x04fa, 0x4201))
+                num = 4;
+        for (i = 0; i < num; i++) {
+                alts = &iface->altsetting[i];
+                altsd = get_iface_desc(alts);
+                protocol = altsd->bInterfaceProtocol;
+                /* skip invalid one */
+                if ((altsd->bInterfaceClass != USB_CLASS_AUDIO &&
+                     altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
+                    (altsd->bInterfaceSubClass != USB_SUBCLASS_AUDIOSTREAMING &&
+                     altsd->bInterfaceSubClass != USB_SUBCLASS_VENDOR_SPEC) ||
+                    altsd->bNumEndpoints < 1 ||
+                    le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) == 0)
+                        continue;
+                /* must be isochronous */
+                if ((get_endpoint(alts, 0)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
+                    USB_ENDPOINT_XFER_ISOC)
+                        continue;
+                /* check direction */
+                stream = (get_endpoint(alts, 0)->bEndpointAddress & USB_DIR_IN) ?
+                        SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
+                altno = altsd->bAlternateSetting;
+                if (snd_usb_apply_interface_quirk(chip, iface_no, altno))
+                        continue;
+                /* get audio formats */
+                switch (protocol) {
+                default:
+                        snd_printdd(KERN_WARNING "%d:%u:%d: unknown interface protocol %#02x, assuming v1\n",
+                                    dev->devnum, iface_no, altno, protocol);
+                        protocol = UAC_VERSION_1;
+                        /* fall through */
+                case UAC_VERSION_1: {
+                        struct uac1_as_header_descriptor *as =
+                                snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
+                        if (!as) {
+                                snd_printk(KERN_ERR "%d:%u:%d : UAC_AS_GENERAL descriptor not found\n",
+                                           dev->devnum, iface_no, altno);
+                                continue;
+                        }
-        set_bit(EP_FLAG_RUNNING, &ep->flags);
+                        if (as->bLength < sizeof(*as)) {
+                                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_AS_GENERAL desc\n",
-        if (snd_usb_endpoint_implict_feedback_sink(ep)) {
+                                           dev->devnum, iface_no, altno);
-                for (i = 0; i < ep->nurbs; i++) {
+                                continue;
-                        struct snd_urb_ctx *ctx = ep->urb + i;
+                        }
-                        list_add_tail(&ctx->ready_list, &ep->ready_playback_urbs);
-                }
-                return 0;
-        }
-        for (i = 0; i < ep->nurbs; i++) {
-                struct urb *urb = ep->urb[i].urb;
-                if (snd_BUG_ON(!urb))
-                        goto __error;
-                if (usb_pipeout(ep->pipe)) {
-                        prepare_outbound_urb(ep, urb->context);
-                } else {
-                        prepare_inbound_urb(ep, urb->context);
-                }
-                err = usb_submit_urb(urb, GFP_ATOMIC);
+                        format = le16_to_cpu(as->wFormatTag); /* remember the format value */
-                if (err < 0) {
+                        break;
-                        snd_printk(KERN_ERR "cannot submit urb %d, error %d: %s\n",
-                                   i, err, usb_error_string(err));
-                        goto __error;
                }
-                set_bit(i, &ep->active_mask);
-        }
-        return 0;
-__error:
+                case UAC_VERSION_2: {
-        clear_bit(EP_FLAG_RUNNING, &ep->flags);
+                        struct uac2_input_terminal_descriptor *input_term;
-        ep->use_count--;
+                        struct uac2_output_terminal_descriptor *output_term;
-        deactivate_urbs(ep, false);
+                        struct uac2_as_header_descriptor *as =
-        return -EPIPE;
+                                snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
-}
-/**
- * snd_usb_endpoint_stop: stop an snd_usb_endpoint
- *
- * @ep: the endpoint to stop (may be NULL)
- *
- * A call to this function will decrement the use count of the endpoint.
- * In case the last user has requested the endpoint stop, the URBs will
- * actually be deactivated.
- *
- * Must be balanced to calls of snd_usb_endpoint_start().
- *
- * The caller needs to synchronize the pending stop operation via
- * snd_usb_endpoint_sync_pending_stop().
- */
-void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep)
-{
-        if (!ep)
-                return;
-        if (snd_BUG_ON(ep->use_count == 0))
-                return;
-        if (--ep->use_count == 0) {
-                deactivate_urbs(ep, false);
-                ep->data_subs = NULL;
-                ep->sync_slave = NULL;
-                ep->retire_data_urb = NULL;
-                ep->prepare_data_urb = NULL;
-                set_bit(EP_FLAG_STOPPING, &ep->flags);
-        }
-}
-/**
- * snd_usb_endpoint_deactivate: deactivate an snd_usb_endpoint
- *
- * @ep: the endpoint to deactivate
- *
- * If the endpoint is not currently in use, this functions will select the
- * alternate interface setting 0 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_deactivate(struct snd_usb_endpoint *ep)
-{
-        if (!ep)
-                return -EINVAL;
-        deactivate_urbs(ep, true);
+                        if (!as) {
-        wait_clear_urbs(ep);
+                                snd_printk(KERN_ERR "%d:%u:%d : UAC_AS_GENERAL descriptor not found\n",
+                                           dev->devnum, iface_no, altno);
-        if (ep->use_count != 0)
+                                continue;
-                return 0;
+                        }
-        clear_bit(EP_FLAG_ACTIVATED, &ep->flags);
-        return 0;
-}
-/**
- * snd_usb_endpoint_free: Free the resources of an snd_usb_endpoint
- *
- * @ep: the list header of the endpoint to free
- *
- * This function does not care for the endpoint's use count but will tear
- * down all the streaming URBs immediately and free all resources.
- */
-void snd_usb_endpoint_free(struct list_head *head)
-{
-        struct snd_usb_endpoint *ep;
-        ep = list_entry(head, struct snd_usb_endpoint, list);
-        release_urbs(ep, 1);
-        kfree(ep);
-}
-/**
+                        if (as->bLength < sizeof(*as)) {
- * snd_usb_handle_sync_urb: parse an USB sync packet
+                                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_AS_GENERAL desc\n",
- *
+                                           dev->devnum, iface_no, altno);
- * @ep: the endpoint to handle the packet
+                                continue;
- * @sender: the sending endpoint
+                        }
- * @urb: the received packet
- *
- * This function is called from the context of an endpoint that received
- * the packet and is used to let another endpoint object handle the payload.
- */
-void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep,
-                             struct snd_usb_endpoint *sender,
-                             const struct urb *urb)
-{
-        int shift;
-        unsigned int f;
-        unsigned long flags;
-        snd_BUG_ON(ep == sender);
+                        num_channels = as->bNrChannels;
+                        format = le32_to_cpu(as->bmFormats);
-        /*
+                        /* lookup the terminal associated to this interface
-         * In case the endpoint is operating in implicit feedback mode, prepare
+                         * to extract the clock */
-         * a new outbound URB that has the same layout as the received packet
+                        input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
-         * and add it to the list of pending urbs. queue_pending_output_urbs()
+                                                                            as->bTerminalLink);
-         * will take care of them later.
+                        if (input_term) {
-         */
+                                clock = input_term->bCSourceID;
-        if (snd_usb_endpoint_implict_feedback_sink(ep) &&
+                                break;
-            ep->use_count != 0) {
+                        }
-                /* implicit feedback case */
+                        output_term = snd_usb_find_output_terminal_descriptor(chip->ctrl_intf,
-                int i, bytes = 0;
+                                                                              as->bTerminalLink);
-                struct snd_urb_ctx *in_ctx;
+                        if (output_term) {
-                struct snd_usb_packet_info *out_packet;
+                                clock = output_term->bCSourceID;
+                                break;
+                        }
-                in_ctx = urb->context;
+                        snd_printk(KERN_ERR "%d:%u:%d : bogus bTerminalLink %d\n",
+                                   dev->devnum, iface_no, altno, as->bTerminalLink);
+                        continue;
+                }
+                }
-                /* Count overall packet size */
+                /* get format type */
-                for (i = 0; i < in_ctx->packets; i++)
+                fmt = snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_FORMAT_TYPE);
-                        if (urb->iso_frame_desc[i].status == 0)
+                if (!fmt) {
-                                bytes += urb->iso_frame_desc[i].actual_length;
+                        snd_printk(KERN_ERR "%d:%u:%d : no UAC_FORMAT_TYPE desc\n",
+                                   dev->devnum, iface_no, altno);
+                        continue;
+                }
+                if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) ||
+                    ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) {
+                        snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
+                                   dev->devnum, iface_no, altno);
+                        continue;
+                }
                /*
-                 * skip empty packets. At least M-Audio's Fast Track Ultra stops
+                 * Blue Microphones workaround: The last altsetting is identical
-                 * streaming once it received a 0-byte OUT URB
+                 * with the previous one, except for a larger packet size, but
+                 * is actually a mislabeled two-channel setting; ignore it.
                 */
-                if (bytes == 0)
+                if (fmt->bNrChannels == 1 &&
-                        return;
+                    fmt->bSubframeSize == 2 &&
+                    altno == 2 && num == 3 &&
-                spin_lock_irqsave(&ep->lock, flags);
+                    fp && fp->altsetting == 1 && fp->channels == 1 &&
-                out_packet = ep->next_packet + ep->next_packet_write_pos;
+                    fp->formats == SNDRV_PCM_FMTBIT_S16_LE &&
+                    protocol == UAC_VERSION_1 &&
+                    le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) ==
+                                                        fp->maxpacksize * 2)
+                        continue;
+                fp = kzalloc(sizeof(*fp), GFP_KERNEL);
+                if (! fp) {
+                        snd_printk(KERN_ERR "cannot malloc\n");
+                        return -ENOMEM;
+                }
+                fp->iface = iface_no;
+                fp->altsetting = altno;
+                fp->altset_idx = i;
+                fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
+                fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
+                fp->datainterval = snd_usb_parse_datainterval(chip, alts);
+                fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
+                /* num_channels is only set for v2 interfaces */
+                fp->channels = num_channels;
+                if (snd_usb_get_speed(dev) == USB_SPEED_HIGH)
+                        fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1)
+                                        * (fp->maxpacksize & 0x7ff);
+                fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol, iface_no);
+                fp->clock = clock;
+                /* some quirks for attributes here */
+                switch (chip->usb_id) {
+                case USB_ID(0x0a92, 0x0053): /* AudioTrak Optoplay */
+                        /* Optoplay sets the sample rate attribute although
+                         * it seems not supporting it in fact.
+                         */
+                        fp->attributes &= ~UAC_EP_CS_ATTR_SAMPLE_RATE;
+                        break;
+                case USB_ID(0x041e, 0x3020): /* Creative SB Audigy 2 NX */
+                case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
+                        /* doesn't set the sample rate attribute, but supports it */
+                        fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
+                        break;
+                case USB_ID(0x0763, 0x2001):  /* M-Audio Quattro USB */
+                case USB_ID(0x0763, 0x2012):  /* M-Audio Fast Track Pro USB */
+                case USB_ID(0x047f, 0x0ca1): /* plantronics headset */
+                case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is
+                                                an older model 77d:223) */
                /*
-                 * Iterate through the inbound packet and prepare the lengths
+                 * plantronics headset and Griffin iMic have set adaptive-in
-                 * for the output packet. The OUT packet we are about to send
+                 * although it's really not...
-                 * will have the same amount of payload bytes per stride as the
-                 * IN packet we just received. Since the actual size is scaled
-                 * by the stride, use the sender stride to calculate the length
-                 * in case the number of channels differ between the implicitly
-                 * fed-back endpoint and the synchronizing endpoint.
                 */
+                        fp->ep_attr &= ~USB_ENDPOINT_SYNCTYPE;
-                out_packet->packets = in_ctx->packets;
+                        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-                for (i = 0; i < in_ctx->packets; i++) {
+                                fp->ep_attr |= USB_ENDPOINT_SYNC_ADAPTIVE;
-                        if (urb->iso_frame_desc[i].status == 0)
-                                out_packet->packet_size[i] =
-                                        urb->iso_frame_desc[i].actual_length / sender->stride;
                        else
-                                out_packet->packet_size[i] = 0;
+                                fp->ep_attr |= USB_ENDPOINT_SYNC_SYNC;
+                        break;
                }
-                ep->next_packet_write_pos++;
+                /* ok, let's parse further... */
-                ep->next_packet_write_pos %= MAX_URBS;
+                if (snd_usb_parse_audio_format(chip, fp, format, fmt, stream, alts) < 0) {
-                spin_unlock_irqrestore(&ep->lock, flags);
+                        kfree(fp->rate_table);
-                queue_pending_output_urbs(ep);
+                        kfree(fp);
+                        fp = NULL;
-                return;
+                        continue;
-        }
-        /*
-         * process after playback sync complete
-         *
-         * Full speed devices report feedback values in 10.14 format as samples
-         * per frame, high speed devices in 16.16 format as samples per
-         * microframe.
-         *
-         * Because the Audio Class 1 spec was written before USB 2.0, many high
-         * speed devices use a wrong interpretation, some others use an
-         * entirely different format.
-         *
-         * Therefore, we cannot predict what format any particular device uses
-         * and must detect it automatically.
-         */
-        if (urb->iso_frame_desc[0].status != 0 ||
-            urb->iso_frame_desc[0].actual_length < 3)
-                return;
-        f = le32_to_cpup(urb->transfer_buffer);
-        if (urb->iso_frame_desc[0].actual_length == 3)
-                f &= 0x00ffffff;
-        else
-                f &= 0x0fffffff;
-        if (f == 0)
-                return;
-        if (unlikely(ep->freqshift == INT_MIN)) {
-                /*
-                 * The first time we see a feedback value, determine its format
-                 * by shifting it left or right until it matches the nominal
-                 * frequency value.  This assumes that the feedback does not
-                 * differ from the nominal value more than +50% or -25%.
-                 */
-                shift = 0;
-                while (f < ep->freqn - ep->freqn / 4) {
-                        f <<= 1;
-                        shift++;
-                }
-                while (f > ep->freqn + ep->freqn / 2) {
-                        f >>= 1;
-                        shift--;
                }
-                ep->freqshift = shift;
-        } else if (ep->freqshift >= 0)
-                f <<= ep->freqshift;
-        else
-                f >>= -ep->freqshift;
-        if (likely(f >= ep->freqn - ep->freqn / 8 && f <= ep->freqmax)) {
+                snd_printdd(KERN_INFO "%d:%u:%d: add audio endpoint %#x\n", dev->devnum, iface_no, altno, fp->endpoint);
-                /*
+                err = snd_usb_add_audio_endpoint(chip, stream, fp);
-                 * If the frequency looks valid, set it.
+                if (err < 0) {
-                 * This value is referred to in prepare_playback_urb().
+                        kfree(fp->rate_table);
-                 */
+                        kfree(fp);
-                spin_lock_irqsave(&ep->lock, flags);
+                        return err;
-                ep->freqm = f;
+                }
-                spin_unlock_irqrestore(&ep->lock, flags);
+                /* try to set the interface... */
-        } else {
+                usb_set_interface(chip->dev, iface_no, altno);
-                /*
+                snd_usb_init_pitch(chip, iface_no, alts, fp);
-                 * Out of range; maybe the shift value is wrong.
+                snd_usb_init_sample_rate(chip, iface_no, alts, fp, fp->rate_max);
-                 * Reset it so that we autodetect again the next time.
-                 */
-                ep->freqshift = INT_MIN;
        }
+        return 0;
 }
diff --git a/sound/usb/endpoint.h b/sound/usb/endpoint.h
index 447902dd8a4..64dd0db023b 100644
--- a/sound/usb/endpoint.h
+++ b/sound/usb/endpoint.h
@@ -1,33 +1,11 @@
 #ifndef __USBAUDIO_ENDPOINT_H
 #define __USBAUDIO_ENDPOINT_H
-#define SND_USB_ENDPOINT_TYPE_DATA     0
+int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip,
-#define SND_USB_ENDPOINT_TYPE_SYNC     1
+                                  int iface_no);
-struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip,
+int snd_usb_add_audio_endpoint(struct snd_usb_audio *chip,
-                                              struct usb_host_interface *alts,
+                               int stream,
-                                              int ep_num, int direction, int type);
+                               struct audioformat *fp);
-int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep,
-                                snd_pcm_format_t pcm_format,
-                                unsigned int channels,
-                                unsigned int period_bytes,
-                                unsigned int rate,
-                                struct audioformat *fmt,
-                                struct snd_usb_endpoint *sync_ep);
-int  snd_usb_endpoint_start(struct snd_usb_endpoint *ep, bool can_sleep);
-void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep);
-void snd_usb_endpoint_sync_pending_stop(struct snd_usb_endpoint *ep);
-int  snd_usb_endpoint_activate(struct snd_usb_endpoint *ep);
-int  snd_usb_endpoint_deactivate(struct snd_usb_endpoint *ep);
-void snd_usb_endpoint_free(struct list_head *head);
-int snd_usb_endpoint_implict_feedback_sink(struct snd_usb_endpoint *ep);
-int snd_usb_endpoint_next_packet_size(struct snd_usb_endpoint *ep);
-void snd_usb_handle_sync_urb(struct snd_usb_endpoint *ep,
-                             struct snd_usb_endpoint *sender,
-                             const struct urb *urb);
 #endif /* __USBAUDIO_ENDPOINT_H */
diff --git a/sound/usb/format.c b/sound/usb/format.c
index e831ee4238b..8d042dce0d1 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -155,7 +155,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
        if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
                                   chip->dev->devnum, fp->iface, fp->altsetting);
-                return -EINVAL;
+                return -1;
        }
        if (nr_rates) {
@@ -167,7 +167,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
                fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
                if (fp->rate_table == NULL) {
                        snd_printk(KERN_ERR "cannot malloc\n");
-                        return -ENOMEM;
+                        return -1;
                }
                fp->nr_rates = 0;
@@ -198,7 +198,7 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof
                }
                if (!fp->nr_rates) {
                        hwc_debug("All rates were zero. Skipping format!\n");
-                        return -EINVAL;
+                        return -1;
                }
        } else {
                /* continuous rates */
@@ -226,7 +226,7 @@ static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets,
                int min = combine_quad(&data[2 + 12 * i]);
                int max = combine_quad(&data[6 + 12 * i]);
                int res = combine_quad(&data[10 + 12 * i]);
-                unsigned int rate;
+                int rate;
                if ((max < 0) || (min < 0) || (res < 0) || (max < min))
                        continue;
@@ -253,10 +253,6 @@ static int parse_uac2_sample_rate_range(struct audioformat *fp, int nr_triplets,
                        fp->rates |= snd_pcm_rate_to_rate_bit(rate);
                        nr_rates++;
-                        if (nr_rates >= MAX_NR_RATES) {
-                                snd_printk(KERN_ERR "invalid uac2 rates\n");
-                                break;
-                        }
                        /* avoid endless loop */
                        if (res == 0)
@@ -290,7 +286,7 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,
                              USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
                              UAC2_CS_CONTROL_SAM_FREQ << 8,
                              snd_usb_ctrl_intf(chip) | (clock << 8),
-                              tmp, sizeof(tmp));
+                              tmp, sizeof(tmp), 1000);
        if (ret < 0) {
                snd_printk(KERN_ERR "%s(): unable to retrieve number of sample rates (clock %d)\n",
@@ -311,7 +307,7 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip,
                              USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
                              UAC2_CS_CONTROL_SAM_FREQ << 8,
                              snd_usb_ctrl_intf(chip) | (clock << 8),
-                              data, data_size);
+                              data, data_size, 1000);
        if (ret < 0) {
                snd_printk(KERN_ERR "%s(): unable to retrieve sample rate range (clock %d)\n",
@@ -383,7 +379,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
                fp->formats = parse_audio_format_i_type(chip, fp, format,
                                                        fmt, protocol);
                if (!fp->formats)
-                        return -EINVAL;
+                        return -1;
        }
        /* gather possible sample rates */
@@ -409,7 +405,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
        if (fp->channels < 1) {
                snd_printk(KERN_ERR "%d:%u:%d : invalid channels %d\n",
                           chip->dev->devnum, fp->iface, fp->altsetting, fp->channels);
-                return -EINVAL;
+                return -1;
        }
        return ret;
diff --git a/sound/usb/helper.c b/sound/usb/helper.c
index c1db28f874c..f280c1903c2 100644
--- a/sound/usb/helper.c
+++ b/sound/usb/helper.c
@@ -21,7 +21,6 @@
 #include "usbaudio.h"
 #include "helper.h"
-#include "quirks.h"
 /*
 * combine bytes and get an integer value
@@ -82,7 +81,7 @@ void *snd_usb_find_csint_desc(void *buffer, int buflen, void *after, u8 dsubtype
 */
 int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
                    __u8 requesttype, __u16 value, __u16 index, void *data,
-                    __u16 size)
+                    __u16 size, int timeout)
 {
        int err;
        void *buf = NULL;
@@ -93,15 +92,11 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
                        return -ENOMEM;
        }
        err = usb_control_msg(dev, pipe, request, requesttype,
-                              value, index, buf, size, 1000);
+                              value, index, buf, size, timeout);
        if (size > 0) {
                memcpy(data, buf, size);
                kfree(buf);
        }
-        snd_usb_ctl_msg_quirk(dev, pipe, request, requesttype,
-                              value, index, data, size);
        return err;
 }
diff --git a/sound/usb/helper.h b/sound/usb/helper.h
index 805c300dd00..09bd943c43b 100644
--- a/sound/usb/helper.h
+++ b/sound/usb/helper.h
@@ -8,7 +8,7 @@ void *snd_usb_find_csint_desc(void *descstart, int desclen, void *after, u8 dsub
 int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe,
                    __u8 request, __u8 requesttype, __u16 value, __u16 index,
-                    void *data, __u16 size);
+                    void *data, __u16 size, int timeout);
 unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip,
                                         struct usb_host_interface *alts);
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 34b9bb7fe87..f9289102886 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -47,7 +47,6 @@
 #include <linux/usb.h>
 #include <linux/wait.h>
 #include <linux/usb/audio.h>
-#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/control.h>
@@ -116,7 +115,6 @@ struct snd_usb_midi {
        struct list_head list;
        struct timer_list error_timer;
        spinlock_t disc_lock;
-        struct rw_semaphore disc_rwsem;
        struct mutex mutex;
        u32 usb_id;
        int next_midi_device;
@@ -126,10 +124,8 @@ struct snd_usb_midi {
                struct snd_usb_midi_in_endpoint *in;
        } endpoints[MIDI_MAX_ENDPOINTS];
        unsigned long input_triggered;
-        bool autopm_reference;
+        unsigned int opened;
-        unsigned int opened[2];
        unsigned char disconnected;
-        unsigned char input_running;
        struct snd_kcontrol *roland_load_ctl;
 };
@@ -820,22 +816,6 @@ static struct usb_protocol_ops snd_usbmidi_raw_ops = {
        .output = snd_usbmidi_raw_output,
 };
-/*
- * FTDI protocol: raw MIDI bytes, but input packets have two modem status bytes.
- */
-static void snd_usbmidi_ftdi_input(struct snd_usb_midi_in_endpoint* ep,
-                                   uint8_t* buffer, int buffer_length)
-{
-        if (buffer_length > 2)
-                snd_usbmidi_input_data(ep, 0, buffer + 2, buffer_length - 2);
-}
-static struct usb_protocol_ops snd_usbmidi_ftdi_ops = {
-        .input = snd_usbmidi_ftdi_input,
-        .output = snd_usbmidi_raw_output,
-};
 static void snd_usbmidi_us122l_input(struct snd_usb_midi_in_endpoint *ep,
                                     uint8_t *buffer, int buffer_length)
 {
@@ -1035,58 +1015,29 @@ static void update_roland_altsetting(struct snd_usb_midi* umidi)
        snd_usbmidi_input_start(&umidi->list);
 }
-static int substream_open(struct snd_rawmidi_substream *substream, int dir,
+static void substream_open(struct snd_rawmidi_substream *substream, int open)
-                          int open)
 {
        struct snd_usb_midi* umidi = substream->rmidi->private_data;
        struct snd_kcontrol *ctl;
-        int err;
-        down_read(&umidi->disc_rwsem);
-        if (umidi->disconnected) {
-                up_read(&umidi->disc_rwsem);
-                return open ? -ENODEV : 0;
-        }
        mutex_lock(&umidi->mutex);
        if (open) {
-                if (!umidi->opened[0] && !umidi->opened[1]) {
+                if (umidi->opened++ == 0 && umidi->roland_load_ctl) {
-                        err = usb_autopm_get_interface(umidi->iface);
+                        ctl = umidi->roland_load_ctl;
-                        umidi->autopm_reference = err >= 0;
+                        ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-                        if (err < 0 && err != -EACCES) {
+                        snd_ctl_notify(umidi->card,
-                                mutex_unlock(&umidi->mutex);
-                                up_read(&umidi->disc_rwsem);
-                                return -EIO;
-                        }
-                        if (umidi->roland_load_ctl) {
-                                ctl = umidi->roland_load_ctl;
-                                ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-                                snd_ctl_notify(umidi->card,
                                       SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
-                                update_roland_altsetting(umidi);
+                        update_roland_altsetting(umidi);
-                        }
                }
-                umidi->opened[dir]++;
-                if (umidi->opened[1])
-                        snd_usbmidi_input_start(&umidi->list);
        } else {
-                umidi->opened[dir]--;
+                if (--umidi->opened == 0 && umidi->roland_load_ctl) {
-                if (!umidi->opened[1])
+                        ctl = umidi->roland_load_ctl;
-                        snd_usbmidi_input_stop(&umidi->list);
+                        ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-                if (!umidi->opened[0] && !umidi->opened[1]) {
+                        snd_ctl_notify(umidi->card,
-                        if (umidi->roland_load_ctl) {
-                                ctl = umidi->roland_load_ctl;
-                                ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-                                snd_ctl_notify(umidi->card,
                                       SNDRV_CTL_EVENT_MASK_INFO, &ctl->id);
-                        }
-                        if (umidi->autopm_reference)
-                                usb_autopm_put_interface(umidi->iface);
                }
        }
        mutex_unlock(&umidi->mutex);
-        up_read(&umidi->disc_rwsem);
-        return 0;
 }
 static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
@@ -1094,6 +1045,7 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
        struct snd_usb_midi* umidi = substream->rmidi->private_data;
        struct usbmidi_out_port* port = NULL;
        int i, j;
+        int err;
        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
                if (umidi->endpoints[i].out)
@@ -1106,15 +1058,22 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
                snd_BUG();
                return -ENXIO;
        }
+        err = usb_autopm_get_interface(umidi->iface);
+        if (err < 0)
+                return -EIO;
        substream->runtime->private_data = port;
        port->state = STATE_UNKNOWN;
-        return substream_open(substream, 0, 1);
+        substream_open(substream, 1);
+        return 0;
 }
 static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream)
 {
-        return substream_open(substream, 0, 0);
+        struct snd_usb_midi* umidi = substream->rmidi->private_data;
+        substream_open(substream, 0);
+        usb_autopm_put_interface(umidi->iface);
+        return 0;
 }
 static void snd_usbmidi_output_trigger(struct snd_rawmidi_substream *substream, int up)
@@ -1167,12 +1126,14 @@ static void snd_usbmidi_output_drain(struct snd_rawmidi_substream *substream)
 static int snd_usbmidi_input_open(struct snd_rawmidi_substream *substream)
 {
-        return substream_open(substream, 1, 1);
+        substream_open(substream, 1);
+        return 0;
 }
 static int snd_usbmidi_input_close(struct snd_rawmidi_substream *substream)
 {
-        return substream_open(substream, 1, 0);
+        substream_open(substream, 0);
+        return 0;
 }
 static void snd_usbmidi_input_trigger(struct snd_rawmidi_substream *substream, int up)
@@ -1421,12 +1382,9 @@ void snd_usbmidi_disconnect(struct list_head* p)
         * a timer may submit an URB. To reliably break the cycle
         * a flag under lock must be used
         */
-        down_write(&umidi->disc_rwsem);
        spin_lock_irq(&umidi->disc_lock);
        umidi->disconnected = 1;
        spin_unlock_irq(&umidi->disc_lock);
-        up_write(&umidi->disc_rwsem);
        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
                struct snd_usb_midi_endpoint* ep = &umidi->endpoints[i];
                if (ep->out)
@@ -2081,15 +2039,12 @@ void snd_usbmidi_input_stop(struct list_head* p)
        unsigned int i, j;
        umidi = list_entry(p, struct snd_usb_midi, list);
-        if (!umidi->input_running)
-                return;
        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
                struct snd_usb_midi_endpoint* ep = &umidi->endpoints[i];
                if (ep->in)
                        for (j = 0; j < INPUT_URBS; ++j)
                                usb_kill_urb(ep->in->urbs[j]);
        }
-        umidi->input_running = 0;
 }
 static void snd_usbmidi_input_start_ep(struct snd_usb_midi_in_endpoint* ep)
@@ -2114,11 +2069,8 @@ void snd_usbmidi_input_start(struct list_head* p)
        int i;
        umidi = list_entry(p, struct snd_usb_midi, list);
-        if (umidi->input_running || !umidi->opened[1])
-                return;
        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
                snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
-        umidi->input_running = 1;
 }
 /*
@@ -2144,7 +2096,6 @@ int snd_usbmidi_create(struct snd_card *card,
        umidi->usb_protocol_ops = &snd_usbmidi_standard_ops;
        init_timer(&umidi->error_timer);
        spin_lock_init(&umidi->disc_lock);
-        init_rwsem(&umidi->disc_rwsem);
        mutex_init(&umidi->mutex);
        umidi->usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor),
                               le16_to_cpu(umidi->dev->descriptor.idProduct));
@@ -2212,17 +2163,6 @@ int snd_usbmidi_create(struct snd_card *card,
                /* endpoint 1 is input-only */
                endpoints[1].out_cables = 0;
                break;
-        case QUIRK_MIDI_FTDI:
-                umidi->usb_protocol_ops = &snd_usbmidi_ftdi_ops;
-                /* set baud rate to 31250 (48 MHz / 16 / 96) */
-                err = usb_control_msg(umidi->dev, usb_sndctrlpipe(umidi->dev, 0),
-                                      3, 0x40, 0x60, 0, NULL, 0, 1000);
-                if (err < 0)
-                        break;
-                err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
-                break;
        default:
                snd_printd(KERN_ERR "invalid quirk type %d\n", quirk->type);
                err = -ENXIO;
@@ -2257,6 +2197,9 @@ int snd_usbmidi_create(struct snd_card *card,
        }
        list_add_tail(&umidi->list, midi_list);
+        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i)
+                snd_usbmidi_input_start_ep(umidi->endpoints[i].in);
        return 0;
 }
diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 8b81cb54026..c0609c21030 100644
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -52,7 +52,7 @@ MODULE_SUPPORTED_DEVICE("{{Edirol,UA-101},{Edirol,UA-1000}}");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 static unsigned int queue_length = 21;
 module_param_array(index, int, NULL, 0444);
@@ -1387,4 +1387,16 @@ static struct usb_driver ua101_driver = {
 #endif
 };
-module_usb_driver(ua101_driver);
+static int __init alsa_card_ua101_init(void)
+{
+        return usb_register(&ua101_driver);
+}
+static void __exit alsa_card_ua101_exit(void)
+{
+        usb_deregister(&ua101_driver);
+        mutex_destroy(&devices_mutex);
+}
+module_init(alsa_card_ua101_init);
+module_exit(alsa_card_ua101_exit);
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index ed4d89c8b52..0de7cbd99ea 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -287,32 +287,25 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v
        unsigned char buf[2];
        int val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1;
        int timeout = 10;
-        int idx = 0, err;
+        int err;
        err = snd_usb_autoresume(cval->mixer->chip);
        if (err < 0)
                return -EIO;
-        down_read(&chip->shutdown_rwsem);
        while (timeout-- > 0) {
-                if (chip->shutdown)
-                        break;
-                idx = snd_usb_ctrl_intf(chip) | (cval->id << 8);
                if (snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), request,
                                    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
-                                    validx, idx, buf, val_len) >= val_len) {
+                                    validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
+                                    buf, val_len, 100) >= val_len) {
                        *value_ret = convert_signed_value(cval, snd_usb_combine_bytes(buf, val_len));
-                        err = 0;
+                        snd_usb_autosuspend(cval->mixer->chip);
-                        goto out;
+                        return 0;
                }
        }
-        snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
-                    request, validx, idx, cval->val_type);
-        err = -EINVAL;
- out:
-        up_read(&chip->shutdown_rwsem);
        snd_usb_autosuspend(cval->mixer->chip);
-        return err;
+        snd_printdd(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
+                    request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type);
+        return -EINVAL;
 }
 static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)
@@ -320,7 +313,7 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v
        struct snd_usb_audio *chip = cval->mixer->chip;
        unsigned char buf[2 + 3*sizeof(__u16)]; /* enough space for one range */
        unsigned char *val;
-        int idx = 0, ret, size;
+        int ret, size;
        __u8 bRequest;
        if (request == UAC_GET_CUR) {
@@ -337,22 +330,16 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v
        if (ret)
                goto error;
-        down_read(&chip->shutdown_rwsem);
+        ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
-        if (chip->shutdown)
-                ret = -ENODEV;
-        else {
-                idx = snd_usb_ctrl_intf(chip) | (cval->id << 8);
-                ret = snd_usb_ctl_msg(chip->dev, usb_rcvctrlpipe(chip->dev, 0), bRequest,
                              USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
-                              validx, idx, buf, size);
+                              validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
-        }
+                              buf, size, 1000);
-        up_read(&chip->shutdown_rwsem);
        snd_usb_autosuspend(chip);
        if (ret < 0) {
 error:
                snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
-                           request, validx, idx, cval->val_type);
+                           request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type);
                return ret;
        }
@@ -382,8 +369,6 @@ error:
 static int get_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int *value_ret)
 {
-        validx += cval->idx_off;
        return (cval->mixer->protocol == UAC_VERSION_1) ?
                get_ctl_value_v1(cval, request, validx, value_ret) :
                get_ctl_value_v2(cval, request, validx, value_ret);
@@ -432,9 +417,7 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
 {
        struct snd_usb_audio *chip = cval->mixer->chip;
        unsigned char buf[2];
-        int idx = 0, val_len, err, timeout = 10;
+        int val_len, err, timeout = 10;
-        validx += cval->idx_off;
        if (cval->mixer->protocol == UAC_VERSION_1) {
                val_len = cval->val_type >= USB_MIXER_S16 ? 2 : 1;
@@ -457,27 +440,19 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval,
        err = snd_usb_autoresume(chip);
        if (err < 0)
                return -EIO;
-        down_read(&chip->shutdown_rwsem);
+        while (timeout-- > 0)
-        while (timeout-- > 0) {
-                if (chip->shutdown)
-                        break;
-                idx = snd_usb_ctrl_intf(chip) | (cval->id << 8);
                if (snd_usb_ctl_msg(chip->dev,
                                    usb_sndctrlpipe(chip->dev, 0), request,
                                    USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
-                                    validx, idx, buf, val_len) >= 0) {
+                                    validx, snd_usb_ctrl_intf(chip) | (cval->id << 8),
-                        err = 0;
+                                    buf, val_len, 100) >= 0) {
-                        goto out;
+                        snd_usb_autosuspend(chip);
+                        return 0;
                }
-        }
-        snd_printdd(KERN_ERR "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n",
-                    request, validx, idx, cval->val_type, buf[0], buf[1]);
-        err = -EINVAL;
- out:
-        up_read(&chip->shutdown_rwsem);
        snd_usb_autosuspend(chip);
-        return err;
+        snd_printdd(KERN_ERR "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n",
+                    request, validx, snd_usb_ctrl_intf(chip) | (cval->id << 8), cval->val_type, buf[0], buf[1]);
+        return -EINVAL;
 }
 static int set_cur_ctl_value(struct usb_mixer_elem_info *cval, int validx, int value)
@@ -511,7 +486,7 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel,
 /*
 * TLV callback for mixer volume controls
 */
-int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
+static int 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;
@@ -723,19 +698,8 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_
                        return 0;
                }
                case UAC1_PROCESSING_UNIT:
-                case UAC1_EXTENSION_UNIT:
+                case UAC1_EXTENSION_UNIT: {
-                /* UAC2_PROCESSING_UNIT_V2 */
-                /* UAC2_EFFECT_UNIT */ {
                        struct uac_processing_unit_descriptor *d = p1;
-                        if (state->mixer->protocol == UAC_VERSION_2 &&
-                                hdr[2] == UAC2_EFFECT_UNIT) {
-                                /* UAC2/UAC1 unit IDs overlap here in an
-                                 * uncompatible way. Ignore this unit for now.
-                                 */
-                                return 0;
-                        }
                        if (d->bNrInPins) {
                                id = d->baSourceID[0];
                                break; /* continue to parse */
@@ -806,53 +770,6 @@ 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, 0x2030): /* M-Audio Fast Track C400 */
-                if (strcmp(kctl->id.name, "Effect Duration") == 0) {
-                        cval->min = 0x0000;
-                        cval->max = 0xffff;
-                        cval->res = 0x00e6;
-                        break;
-                }
-                if (strcmp(kctl->id.name, "Effect Volume") == 0 ||
-                    strcmp(kctl->id.name, "Effect Feedback Volume") == 0) {
-                        cval->min = 0x00;
-                        cval->max = 0xff;
-                        break;
-                }
-                if (strstr(kctl->id.name, "Effect Return") != NULL) {
-                        cval->min = 0xb706;
-                        cval->max = 0xff7b;
-                        cval->res = 0x0073;
-                        break;
-                }
-                if ((strstr(kctl->id.name, "Playback Volume") != NULL) ||
-                        (strstr(kctl->id.name, "Effect Send") != NULL)) {
-                        cval->min = 0xb5fb; /* -73 dB = 0xb6ff */
-                        cval->max = 0xfcfe;
-                        cval->res = 0x0073;
-                }
-                break;
-        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):
@@ -882,7 +799,6 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
        case USB_ID(0x046d, 0x0808):
        case USB_ID(0x046d, 0x0809):
-        case USB_ID(0x046d, 0x081d): /* HD Webcam c510 */
        case USB_ID(0x046d, 0x0991):
        /* Most audio usb devices lie about volume resolution.
         * Most Logitech webcams have res = 384.
@@ -1022,7 +938,7 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol, struct snd_ctl_
                if (!cval->initialized) {
                        get_min_max_with_quirks(cval, 0, kcontrol);
                        if (cval->initialized && cval->dBmin >= cval->dBmax) {
-                                kcontrol->vd[0].access &= 
+                                kcontrol->vd[0].access &=
                                        ~(SNDRV_CTL_ELEM_ACCESS_TLV_READ |
                                          SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK);
                                snd_ctl_notify(cval->mixer->chip->card,
@@ -1136,32 +1052,6 @@ static size_t append_ctl_name(struct snd_kcontrol *kctl, const char *str)
        return strlcat(kctl->id.name, str, sizeof(kctl->id.name));
 }
-/* A lot of headsets/headphones have a "Speaker" mixer. Make sure we
-   rename it to "Headphone". We determine if something is a headphone
-   similar to how udev determines form factor. */
-static void check_no_speaker_on_headset(struct snd_kcontrol *kctl,
-                                        struct snd_card *card)
-{
-        const char *names_to_check[] = {
-                "Headset", "headset", "Headphone", "headphone", NULL};
-        const char **s;
-        bool found = 0;
-        if (strcmp("Speaker", kctl->id.name))
-                return;
-        for (s = names_to_check; *s; s++)
-                if (strstr(card->shortname, *s)) {
-                        found = 1;
-                        break;
-                }
-        if (!found)
-                return;
-        strlcpy(kctl->id.name, "Headphone", sizeof(kctl->id.name));
-}
 static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                              unsigned int ctl_mask, int control,
                              struct usb_audio_term *iterm, int unitid,
@@ -1230,6 +1120,9 @@ 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:
@@ -1248,10 +1141,6 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc,
                                len = snprintf(kctl->id.name, sizeof(kctl->id.name),
                                               "Feature %d", unitid);
                }
-                if (!mapped_name)
-                        check_no_speaker_on_headset(kctl, state->mixer->chip->card);
                /* determine the stream direction:
                 * if the connected output is USB stream, then it's likely a
                 * capture stream.  otherwise it should be playback (hopefully :)
@@ -1265,7 +1154,17 @@ 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,
@@ -1273,19 +1172,6 @@ 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
@@ -1360,13 +1246,6 @@ 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);
@@ -1389,7 +1268,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 < ARRAY_SIZE(audio_feature_info); i++) {
+                for (i = 0; i < 30/2; i++) {
                        unsigned int ch_bits = 0;
                        unsigned int ch_read_only = 0;
@@ -1508,7 +1387,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)
-                        continue;
+                        return err;
                err = check_input_term(state, desc->baSourceID[pin], &iterm);
                if (err < 0)
                        return err;
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index aab80df201b..81b2d8a32fb 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -43,7 +43,6 @@ struct usb_mixer_elem_info {
        unsigned int id;
        unsigned int control;   /* CS or ICN (high byte) */
        unsigned int cmask; /* channel mask bitmap: 0 = master */
-        unsigned int idx_off; /* Control index offset */
        unsigned int ch_readonly;
        unsigned int master_readonly;
        int channels;
@@ -69,7 +68,4 @@ int snd_usb_mixer_activate(struct usb_mixer_interface *mixer);
 int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer,
                              struct snd_kcontrol *kctl);
-int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag,
-                          unsigned int size, unsigned int __user *_tlv);
 #endif /* __USBMIXER_H */
diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
index e71fe55cebe..f1324c42383 100644
--- a/sound/usb/mixer_maps.c
+++ b/sound/usb/mixer_maps.c
@@ -288,15 +288,6 @@ static struct usbmix_name_map scratch_live_map[] = {
        { 0 } /* terminator */
 };
-static struct usbmix_name_map ebox44_map[] = {
-        { 4, NULL }, /* FU */
-        { 6, NULL }, /* MU */
-        { 7, NULL }, /* FU */
-        { 10, NULL }, /* FU */
-        { 11, NULL }, /* MU */
-        { 0 }
-};
 /* "Gamesurround Muse Pocket LT" looks same like "Sound Blaster MP3+"
 *  most importand difference is SU[8], it should be set to "Capture Source"
 *  to make alsamixer and PA working properly.
@@ -341,14 +332,6 @@ 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),
@@ -388,10 +371,6 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
                .map = scratch_live_map,
                .ignore_ctl_error = 1,
        },
-        {
-                .id = USB_ID(0x200c, 0x1018),
-                .map = ebox44_map,
-        },
        { 0 } /* terminator */
 };
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 15520de1df5..3d0f4873112 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -42,117 +42,6 @@
 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)
-{
-        kfree(kctl->private_data);
-        kctl->private_data = NULL;
-}
-/* This function allows for the creation of standard UAC controls.
- * See the quirks for M-Audio FTUs or Ebox-44.
- * If you don't want to set a TLV callback pass NULL.
- *
- * Since there doesn't seem to be a devices that needs a multichannel
- * version, we keep it mono for simplicity.
- */
-static int snd_create_std_mono_ctl_offset(struct usb_mixer_interface *mixer,
-                                unsigned int unitid,
-                                unsigned int control,
-                                unsigned int cmask,
-                                int val_type,
-                                unsigned int idx_off,
-                                const char *name,
-                                snd_kcontrol_tlv_rw_t *tlv_callback)
-{
-        int err;
-        struct usb_mixer_elem_info *cval;
-        struct snd_kcontrol *kctl;
-        cval = kzalloc(sizeof(*cval), GFP_KERNEL);
-        if (!cval)
-                return -ENOMEM;
-        cval->id = unitid;
-        cval->mixer = mixer;
-        cval->val_type = val_type;
-        cval->channels = 1;
-        cval->control = control;
-        cval->cmask = cmask;
-        cval->idx_off = idx_off;
-        /* get_min_max() is called only for integer volumes later,
-         * so provide a short-cut for booleans */
-        cval->min = 0;
-        cval->max = 1;
-        cval->res = 0;
-        cval->dBmin = 0;
-        cval->dBmax = 0;
-        /* Create control */
-        kctl = snd_ctl_new1(snd_usb_feature_unit_ctl, cval);
-        if (!kctl) {
-                kfree(cval);
-                return -ENOMEM;
-        }
-        /* Set name */
-        snprintf(kctl->id.name, sizeof(kctl->id.name), name);
-        kctl->private_free = usb_mixer_elem_free;
-        /* set TLV */
-        if (tlv_callback) {
-                kctl->tlv.c = tlv_callback;
-                kctl->vd[0].access |=
-                        SNDRV_CTL_ELEM_ACCESS_TLV_READ |
-                        SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK;
-        }
-        /* Add control to mixer */
-        err = snd_usb_mixer_add_control(mixer, kctl);
-        if (err < 0)
-                return err;
-        return 0;
-}
-static int snd_create_std_mono_ctl(struct usb_mixer_interface *mixer,
-                                unsigned int unitid,
-                                unsigned int control,
-                                unsigned int cmask,
-                                int val_type,
-                                const char *name,
-                                snd_kcontrol_tlv_rw_t *tlv_callback)
-{
-        return snd_create_std_mono_ctl_offset(mixer, unitid, control, cmask,
-                val_type, 0 /* Offset */, name, tlv_callback);
-}
-/*
- * 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
 *
@@ -297,29 +186,22 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e
        if (value > 1)
                return -EINVAL;
        changed = value != mixer->audigy2nx_leds[index];
-        down_read(&mixer->chip->shutdown_rwsem);
-        if (mixer->chip->shutdown) {
-                err = -ENODEV;
-                goto out;
-        }
        if (mixer->chip->usb_id == USB_ID(0x041e, 0x3042))
                err = snd_usb_ctl_msg(mixer->chip->dev,
                              usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                              !value, 0, NULL, 0);
+                              !value, 0, NULL, 0, 100);
        /* USB X-Fi S51 Pro */
        if (mixer->chip->usb_id == USB_ID(0x041e, 0x30df))
                err = snd_usb_ctl_msg(mixer->chip->dev,
                              usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                              !value, 0, NULL, 0);
+                              !value, 0, NULL, 0, 100);
        else
                err = snd_usb_ctl_msg(mixer->chip->dev,
                              usb_sndctrlpipe(mixer->chip->dev, 0), 0x24,
                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                              value, index + 2, NULL, 0);
+                              value, index + 2, NULL, 0, 100);
- out:
-        up_read(&mixer->chip->shutdown_rwsem);
        if (err < 0)
                return err;
        mixer->audigy2nx_leds[index] = value;
@@ -413,16 +295,11 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
        for (i = 0; jacks[i].name; ++i) {
                snd_iprintf(buffer, "%s: ", jacks[i].name);
-                down_read(&mixer->chip->shutdown_rwsem);
+                err = snd_usb_ctl_msg(mixer->chip->dev,
-                if (mixer->chip->shutdown)
-                        err = 0;
-                else
-                        err = snd_usb_ctl_msg(mixer->chip->dev,
                                      usb_rcvctrlpipe(mixer->chip->dev, 0),
                                      UAC_GET_MEM, USB_DIR_IN | USB_TYPE_CLASS |
                                      USB_RECIP_INTERFACE, 0,
-                                      jacks[i].unitid << 8, buf, 3);
+                                      jacks[i].unitid << 8, buf, 3, 100);
-                up_read(&mixer->chip->shutdown_rwsem);
                if (err == 3 && (buf[0] == 3 || buf[0] == 6))
                        snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]);
                else
@@ -430,8 +307,6 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry,
        }
 }
-/* ASUS Xonar U1 / U3 controls */
 static int snd_xonar_u1_switch_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
@@ -454,15 +329,10 @@ static int snd_xonar_u1_switch_put(struct snd_kcontrol *kcontrol,
        else
                new_status = old_status & ~0x02;
        changed = new_status != old_status;
-        down_read(&mixer->chip->shutdown_rwsem);
+        err = snd_usb_ctl_msg(mixer->chip->dev,
-        if (mixer->chip->shutdown)
-                err = -ENODEV;
-        else
-                err = snd_usb_ctl_msg(mixer->chip->dev,
                              usb_sndctrlpipe(mixer->chip->dev, 0), 0x08,
                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                              50, 0, &new_status, 1);
+                              50, 0, &new_status, 1, 100);
-        up_read(&mixer->chip->shutdown_rwsem);
        if (err < 0)
                return err;
        mixer->xonar_u1_status = new_status;
@@ -501,17 +371,11 @@ static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol,
        u8 bRequest = (kcontrol->private_value >> 16) & 0xff;
        u16 wIndex = kcontrol->private_value & 0xffff;
        u8 tmp;
-        int ret;
-        down_read(&mixer->chip->shutdown_rwsem);
+        int ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest,
-        if (mixer->chip->shutdown)
-                ret = -ENODEV;
-        else
-                ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest,
                                  USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
                                  0, cpu_to_le16(wIndex),
                                  &tmp, sizeof(tmp), 1000);
-        up_read(&mixer->chip->shutdown_rwsem);
        if (ret < 0) {
                snd_printk(KERN_ERR
@@ -532,17 +396,11 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol,
        u8 bRequest = (kcontrol->private_value >> 16) & 0xff;
        u16 wIndex = kcontrol->private_value & 0xffff;
        u16 wValue = ucontrol->value.integer.value[0];
-        int ret;
-        down_read(&mixer->chip->shutdown_rwsem);
+        int ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), bRequest,
-        if (mixer->chip->shutdown)
-                ret = -ENODEV;
-        else
-                ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), bRequest,
                                  USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
                                  cpu_to_le16(wValue), cpu_to_le16(wIndex),
                                  NULL, 0, 1000);
-        up_read(&mixer->chip->shutdown_rwsem);
        if (ret < 0) {
                snd_printk(KERN_ERR
@@ -637,240 +495,60 @@ static int snd_nativeinstruments_create_mixer(struct usb_mixer_interface *mixer,
 }
 /* M-Audio FastTrack Ultra quirks */
-/* FTU Effect switch (also used by C400) */
-struct snd_ftu_eff_switch_priv_val {
-        struct usb_mixer_interface *mixer;
-        int cached_value;
-        int is_cached;
-        int bUnitID;
-        int validx;
-};
-static int snd_ftu_eff_switch_info(struct snd_kcontrol *kcontrol,
-                                        struct snd_ctl_elem_info *uinfo)
-{
-        static const char *texts[8] = {"Room 1",
-                                       "Room 2",
-                                       "Room 3",
-                                       "Hall 1",
-                                       "Hall 2",
-                                       "Plate",
-                                       "Delay",
-                                       "Echo"
-        };
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 8;
-        if (uinfo->value.enumerated.item > 7)
-                uinfo->value.enumerated.item = 7;
-        strcpy(uinfo->value.enumerated.name,
-                texts[uinfo->value.enumerated.item]);
-        return 0;
-}
-static int snd_ftu_eff_switch_get(struct snd_kcontrol *kctl,
-                                        struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_usb_audio *chip;
-        struct usb_mixer_interface *mixer;
-        struct snd_ftu_eff_switch_priv_val *pval;
-        int err;
-        unsigned char value[2];
-        int id, validx;
-        const int val_len = 2;
+/* private_free callback */
+static void usb_mixer_elem_free(struct snd_kcontrol *kctl)
-        value[0] = 0x00;
-        value[1] = 0x00;
-        pval = (struct snd_ftu_eff_switch_priv_val *)
-                kctl->private_value;
-        if (pval->is_cached) {
-                ucontrol->value.enumerated.item[0] = pval->cached_value;
-                return 0;
-        }
-        mixer = (struct usb_mixer_interface *) pval->mixer;
-        if (snd_BUG_ON(!mixer))
-                return -EINVAL;
-        chip = (struct snd_usb_audio *) mixer->chip;
-        if (snd_BUG_ON(!chip))
-                return -EINVAL;
-        id = pval->bUnitID;
-        validx = pval->validx;
-        down_read(&mixer->chip->shutdown_rwsem);
-        if (mixer->chip->shutdown)
-                err = -ENODEV;
-        else
-                err = snd_usb_ctl_msg(chip->dev,
-                        usb_rcvctrlpipe(chip->dev, 0), UAC_GET_CUR,
-                        USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
-                        validx << 8, snd_usb_ctrl_intf(chip) | (id << 8),
-                        value, val_len);
-        up_read(&mixer->chip->shutdown_rwsem);
-        if (err < 0)
-                return err;
-        ucontrol->value.enumerated.item[0] = value[0];
-        pval->cached_value = value[0];
-        pval->is_cached = 1;
-        return 0;
-}
-static int snd_ftu_eff_switch_put(struct snd_kcontrol *kctl,
-                                        struct snd_ctl_elem_value *ucontrol)
 {
-        struct snd_usb_audio *chip;
+        kfree(kctl->private_data);
-        struct snd_ftu_eff_switch_priv_val *pval;
+        kctl->private_data = NULL;
-        struct usb_mixer_interface *mixer;
-        int changed, cur_val, err, new_val;
-        unsigned char value[2];
-        int id, validx;
-        const int val_len = 2;
-        changed = 0;
-        pval = (struct snd_ftu_eff_switch_priv_val *)
-                kctl->private_value;
-        cur_val = pval->cached_value;
-        new_val = ucontrol->value.enumerated.item[0];
-        mixer = (struct usb_mixer_interface *) pval->mixer;
-        if (snd_BUG_ON(!mixer))
-                return -EINVAL;
-        chip = (struct snd_usb_audio *) mixer->chip;
-        if (snd_BUG_ON(!chip))
-                return -EINVAL;
-        id = pval->bUnitID;
-        validx = pval->validx;
-        if (!pval->is_cached) {
-                /* Read current value */
-                down_read(&mixer->chip->shutdown_rwsem);
-                if (mixer->chip->shutdown)
-                        err = -ENODEV;
-                else
-                        err = snd_usb_ctl_msg(chip->dev,
-                                usb_rcvctrlpipe(chip->dev, 0), UAC_GET_CUR,
-                                USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_IN,
-                                validx << 8, snd_usb_ctrl_intf(chip) | (id << 8),
-                                value, val_len);
-                up_read(&mixer->chip->shutdown_rwsem);
-                if (err < 0)
-                        return err;
-                cur_val = value[0];
-                pval->cached_value = cur_val;
-                pval->is_cached = 1;
-        }
-        /* update value if needed */
-        if (cur_val != new_val) {
-                value[0] = new_val;
-                value[1] = 0;
-                down_read(&mixer->chip->shutdown_rwsem);
-                if (mixer->chip->shutdown)
-                        err = -ENODEV;
-                else
-                        err = snd_usb_ctl_msg(chip->dev,
-                                usb_sndctrlpipe(chip->dev, 0), UAC_SET_CUR,
-                                USB_RECIP_INTERFACE | USB_TYPE_CLASS | USB_DIR_OUT,
-                                validx << 8, snd_usb_ctrl_intf(chip) | (id << 8),
-                                value, val_len);
-                up_read(&mixer->chip->shutdown_rwsem);
-                if (err < 0)
-                        return err;
-                pval->cached_value = new_val;
-                pval->is_cached = 1;
-                changed = 1;
-        }
-        return changed;
 }
-static int snd_ftu_create_effect_switch(struct usb_mixer_interface *mixer,
+static int snd_maudio_ftu_create_ctl(struct usb_mixer_interface *mixer,
-        int validx, int bUnitID)
+                                     int in, int out, const char *name)
 {
-        static struct snd_kcontrol_new template = {
+        struct usb_mixer_elem_info *cval;
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Effect Program Switch",
-                .index = 0,
-                .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
-                .info = snd_ftu_eff_switch_info,
-                .get = snd_ftu_eff_switch_get,
-                .put = snd_ftu_eff_switch_put
-        };
-        int err;
        struct snd_kcontrol *kctl;
-        struct snd_ftu_eff_switch_priv_val *pval;
-        pval = kzalloc(sizeof(*pval), GFP_KERNEL);
+        cval = kzalloc(sizeof(*cval), GFP_KERNEL);
-        if (!pval)
+        if (!cval)
                return -ENOMEM;
-        pval->cached_value = 0;
+        cval->id = 5;
-        pval->is_cached = 0;
+        cval->mixer = mixer;
-        pval->mixer = mixer;
+        cval->val_type = USB_MIXER_S16;
-        pval->bUnitID = bUnitID;
+        cval->channels = 1;
-        pval->validx = validx;
+        cval->control = out + 1;
+        cval->cmask = 1 << in;
-        template.private_value = (unsigned long) pval;
+        kctl = snd_ctl_new1(snd_usb_feature_unit_ctl, cval);
-        kctl = snd_ctl_new1(&template, mixer->chip);
        if (!kctl) {
-                kfree(pval);
+                kfree(cval);
                return -ENOMEM;
        }
-        err = snd_ctl_add(mixer->chip->card, kctl);
+        snprintf(kctl->id.name, sizeof(kctl->id.name), name);
-        if (err < 0)
+        kctl->private_free = usb_mixer_elem_free;
-                return err;
+        return snd_usb_mixer_add_control(mixer, kctl);
-        return 0;
 }
-/* Create volume controls for FTU devices*/
+static int snd_maudio_ftu_create_mixer(struct usb_mixer_interface *mixer)
-static int snd_ftu_create_volume_ctls(struct usb_mixer_interface *mixer)
 {
        char name[64];
-        unsigned int control, cmask;
        int in, out, err;
-        const unsigned int id = 5;
-        const int val_type = USB_MIXER_S16;
        for (out = 0; out < 8; out++) {
-                control = out + 1;
                for (in = 0; in < 8; in++) {
-                        cmask = 1 << in;
                        snprintf(name, sizeof(name),
-                                "AIn%d - Out%d Capture Volume",
+                                 "AIn%d - Out%d Capture Volume", in  + 1, out + 1);
-                                in  + 1, out + 1);
+                        err = snd_maudio_ftu_create_ctl(mixer, in, out, name);
-                        err = snd_create_std_mono_ctl(mixer, id, control,
-                                                        cmask, val_type, name,
-                                                        &snd_usb_mixer_vol_tlv);
                        if (err < 0)
                                return err;
                }
                for (in = 8; in < 16; in++) {
-                        cmask = 1 << in;
                        snprintf(name, sizeof(name),
-                                "DIn%d - Out%d Playback Volume",
+                                 "DIn%d - Out%d Playback Volume", in - 7, out + 1);
-                                in - 7, out + 1);
+                        err = snd_maudio_ftu_create_ctl(mixer, in, out, name);
-                        err = snd_create_std_mono_ctl(mixer, id, control,
-                                                        cmask, val_type, name,
-                                                        &snd_usb_mixer_vol_tlv);
                        if (err < 0)
                                return err;
                }
@@ -879,137 +557,6 @@ static int snd_ftu_create_volume_ctls(struct usb_mixer_interface *mixer)
        return 0;
 }
-/* This control needs a volume quirk, see mixer.c */
-static int snd_ftu_create_effect_volume_ctl(struct usb_mixer_interface *mixer)
-{
-        static const char name[] = "Effect Volume";
-        const unsigned int id = 6;
-        const int val_type = USB_MIXER_U8;
-        const unsigned int control = 2;
-        const unsigned int cmask = 0;
-        return snd_create_std_mono_ctl(mixer, id, control, cmask, val_type,
-                                        name, snd_usb_mixer_vol_tlv);
-}
-/* This control needs a volume quirk, see mixer.c */
-static int snd_ftu_create_effect_duration_ctl(struct usb_mixer_interface *mixer)
-{
-        static const char name[] = "Effect Duration";
-        const unsigned int id = 6;
-        const int val_type = USB_MIXER_S16;
-        const unsigned int control = 3;
-        const unsigned int cmask = 0;
-        return snd_create_std_mono_ctl(mixer, id, control, cmask, val_type,
-                                        name, snd_usb_mixer_vol_tlv);
-}
-/* This control needs a volume quirk, see mixer.c */
-static int snd_ftu_create_effect_feedback_ctl(struct usb_mixer_interface *mixer)
-{
-        static const char name[] = "Effect Feedback Volume";
-        const unsigned int id = 6;
-        const int val_type = USB_MIXER_U8;
-        const unsigned int control = 4;
-        const unsigned int cmask = 0;
-        return snd_create_std_mono_ctl(mixer, id, control, cmask, val_type,
-                                        name, NULL);
-}
-static int snd_ftu_create_effect_return_ctls(struct usb_mixer_interface *mixer)
-{
-        unsigned int cmask;
-        int err, ch;
-        char name[48];
-        const unsigned int id = 7;
-        const int val_type = USB_MIXER_S16;
-        const unsigned int control = 7;
-        for (ch = 0; ch < 4; ++ch) {
-                cmask = 1 << ch;
-                snprintf(name, sizeof(name),
-                        "Effect Return %d Volume", ch + 1);
-                err = snd_create_std_mono_ctl(mixer, id, control,
-                                                cmask, val_type, name,
-                                                snd_usb_mixer_vol_tlv);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-static int snd_ftu_create_effect_send_ctls(struct usb_mixer_interface *mixer)
-{
-        unsigned int  cmask;
-        int err, ch;
-        char name[48];
-        const unsigned int id = 5;
-        const int val_type = USB_MIXER_S16;
-        const unsigned int control = 9;
-        for (ch = 0; ch < 8; ++ch) {
-                cmask = 1 << ch;
-                snprintf(name, sizeof(name),
-                        "Effect Send AIn%d Volume", ch + 1);
-                err = snd_create_std_mono_ctl(mixer, id, control, cmask,
-                                                val_type, name,
-                                                snd_usb_mixer_vol_tlv);
-                if (err < 0)
-                        return err;
-        }
-        for (ch = 8; ch < 16; ++ch) {
-                cmask = 1 << ch;
-                snprintf(name, sizeof(name),
-                        "Effect Send DIn%d Volume", ch - 7);
-                err = snd_create_std_mono_ctl(mixer, id, control, cmask,
-                                                val_type, name,
-                                                snd_usb_mixer_vol_tlv);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-static int snd_ftu_create_mixer(struct usb_mixer_interface *mixer)
-{
-        int err;
-        err = snd_ftu_create_volume_ctls(mixer);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_switch(mixer, 1, 6);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_volume_ctl(mixer);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_duration_ctl(mixer);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_feedback_ctl(mixer);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_return_ctls(mixer);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_send_ctls(mixer);
-        if (err < 0)
-                return err;
-        return 0;
-}
 void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
                               unsigned char samplerate_id)
 {
@@ -1029,253 +576,6 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip,
        }
 }
-/* M-Audio Fast Track C400 */
-/* C400 volume controls, this control needs a volume quirk, see mixer.c */
-static int snd_c400_create_vol_ctls(struct usb_mixer_interface *mixer)
-{
-        char name[64];
-        unsigned int cmask, offset;
-        int out, chan, err;
-        const unsigned int id = 0x40;
-        const int val_type = USB_MIXER_S16;
-        const int control = 1;
-        for (chan = 0; chan < 10; chan++) {
-                for (out = 0; out < 6; out++) {
-                        if (chan < 6) {
-                                snprintf(name, sizeof(name),
-                                        "PCM%d-Out%d Playback Volume",
-                                        chan + 1, out + 1);
-                        } else {
-                                snprintf(name, sizeof(name),
-                                        "In%d-Out%d Playback Volume",
-                                        chan - 5, out + 1);
-                        }
-                        cmask = (out == 0) ? 0 : 1 << (out - 1);
-                        offset = chan * 6;
-                        err = snd_create_std_mono_ctl_offset(mixer, id, control,
-                                                cmask, val_type, offset, name,
-                                                &snd_usb_mixer_vol_tlv);
-                        if (err < 0)
-                                return err;
-                }
-        }
-        return 0;
-}
-/* This control needs a volume quirk, see mixer.c */
-static int snd_c400_create_effect_volume_ctl(struct usb_mixer_interface *mixer)
-{
-        static const char name[] = "Effect Volume";
-        const unsigned int id = 0x43;
-        const int val_type = USB_MIXER_U8;
-        const unsigned int control = 3;
-        const unsigned int cmask = 0;
-        return snd_create_std_mono_ctl(mixer, id, control, cmask, val_type,
-                                        name, snd_usb_mixer_vol_tlv);
-}
-/* This control needs a volume quirk, see mixer.c */
-static int snd_c400_create_effect_duration_ctl(struct usb_mixer_interface *mixer)
-{
-        static const char name[] = "Effect Duration";
-        const unsigned int id = 0x43;
-        const int val_type = USB_MIXER_S16;
-        const unsigned int control = 4;
-        const unsigned int cmask = 0;
-        return snd_create_std_mono_ctl(mixer, id, control, cmask, val_type,
-                                        name, snd_usb_mixer_vol_tlv);
-}
-/* This control needs a volume quirk, see mixer.c */
-static int snd_c400_create_effect_feedback_ctl(struct usb_mixer_interface *mixer)
-{
-        static const char name[] = "Effect Feedback Volume";
-        const unsigned int id = 0x43;
-        const int val_type = USB_MIXER_U8;
-        const unsigned int control = 5;
-        const unsigned int cmask = 0;
-        return snd_create_std_mono_ctl(mixer, id, control, cmask, val_type,
-                                        name, NULL);
-}
-static int snd_c400_create_effect_vol_ctls(struct usb_mixer_interface *mixer)
-{
-        char name[64];
-        unsigned int cmask;
-        int chan, err;
-        const unsigned int id = 0x42;
-        const int val_type = USB_MIXER_S16;
-        const int control = 1;
-        for (chan = 0; chan < 10; chan++) {
-                if (chan < 6) {
-                        snprintf(name, sizeof(name),
-                                "Effect Send DOut%d",
-                                chan + 1);
-                } else {
-                        snprintf(name, sizeof(name),
-                                "Effect Send AIn%d",
-                                chan - 5);
-                }
-                cmask = (chan == 0) ? 0 : 1 << (chan - 1);
-                err = snd_create_std_mono_ctl(mixer, id, control,
-                                                cmask, val_type, name,
-                                                &snd_usb_mixer_vol_tlv);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-static int snd_c400_create_effect_ret_vol_ctls(struct usb_mixer_interface *mixer)
-{
-        char name[64];
-        unsigned int cmask;
-        int chan, err;
-        const unsigned int id = 0x40;
-        const int val_type = USB_MIXER_S16;
-        const int control = 1;
-        const int chan_id[6] = { 0, 7, 2, 9, 4, 0xb };
-        const unsigned int offset = 0x3c;
-                                /* { 0x3c, 0x43, 0x3e, 0x45, 0x40, 0x47 } */
-        for (chan = 0; chan < 6; chan++) {
-                snprintf(name, sizeof(name),
-                        "Effect Return %d",
-                        chan + 1);
-                cmask = (chan_id[chan] == 0) ? 0 : 1 << (chan_id[chan] - 1);
-                err = snd_create_std_mono_ctl_offset(mixer, id, control,
-                                                cmask, val_type, offset, name,
-                                                &snd_usb_mixer_vol_tlv);
-                if (err < 0)
-                        return err;
-        }
-        return 0;
-}
-static int snd_c400_create_mixer(struct usb_mixer_interface *mixer)
-{
-        int err;
-        err = snd_c400_create_vol_ctls(mixer);
-        if (err < 0)
-                return err;
-        err = snd_c400_create_effect_vol_ctls(mixer);
-        if (err < 0)
-                return err;
-        err = snd_c400_create_effect_ret_vol_ctls(mixer);
-        if (err < 0)
-                return err;
-        err = snd_ftu_create_effect_switch(mixer, 2, 0x43);
-        if (err < 0)
-                return err;
-        err = snd_c400_create_effect_volume_ctl(mixer);
-        if (err < 0)
-                return err;
-        err = snd_c400_create_effect_duration_ctl(mixer);
-        if (err < 0)
-                return err;
-        err = snd_c400_create_effect_feedback_ctl(mixer);
-        if (err < 0)
-                return err;
-        return 0;
-}
-/*
- * 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.
- */
-static 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;
@@ -1298,18 +598,13 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
                                              snd_audigy2nx_proc_read);
                break;
-        case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */
-                err = snd_c400_create_mixer(mixer);
-                break;
        case USB_ID(0x0763, 0x2080): /* M-Audio Fast Track Ultra */
        case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */
-                err = snd_ftu_create_mixer(mixer);
+                err = snd_maudio_ftu_create_mixer(mixer);
                break;
-        case USB_ID(0x0b05, 0x1739): /* ASUS Xonar U1 */
+        case USB_ID(0x0b05, 0x1739):
-        case USB_ID(0x0b05, 0x1743): /* ASUS Xonar U1 (2) */
+        case USB_ID(0x0b05, 0x1743):
-        case USB_ID(0x0b05, 0x17a0): /* ASUS Xonar U3 */
                err = snd_xonar_u1_controls_create(mixer);
                break;
@@ -1324,11 +619,6 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
                                snd_nativeinstruments_ta10_mixers,
                                ARRAY_SIZE(snd_nativeinstruments_ta10_mixers));
                break;
-        case USB_ID(0x200c, 0x1018): /* Electrix Ebox-44 */
-                /* detection is disabled in mixer_maps.c */
-                err = snd_create_std_mono_table(mixer, ebox44_table);
-                break;
        }
        return err;
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index d82e378d37c..b8dcbf407bb 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/ratelimit.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
 #include <linux/usb/audio-v2.h>
@@ -29,42 +28,12 @@
 #include "card.h"
 #include "quirks.h"
 #include "debug.h"
-#include "endpoint.h"
+#include "urb.h"
 #include "helper.h"
 #include "pcm.h"
 #include "clock.h"
 #include "power.h"
-#define SUBSTREAM_FLAG_DATA_EP_STARTED  0
-#define SUBSTREAM_FLAG_SYNC_EP_STARTED  1
-/* return the estimated delay based on USB frame counters */
-snd_pcm_uframes_t snd_usb_pcm_delay(struct snd_usb_substream *subs,
-                                    unsigned int rate)
-{
-        int current_frame_number;
-        int frame_diff;
-        int est_delay;
-        if (!subs->last_delay)
-                return 0; /* short path */
-        current_frame_number = usb_get_current_frame_number(subs->dev);
-        /*
-         * HCD implementations use different widths, use lower 8 bits.
-         * The delay will be managed up to 256ms, which is more than
-         * enough
-         */
-        frame_diff = (current_frame_number - subs->last_frame_number) & 0xff;
-        /* Approximation based on number of samples per USB frame (ms),
-           some truncation for 44.1 but the estimate is good enough */
-        est_delay =  subs->last_delay - (frame_diff * rate / 1000);
-        if (est_delay < 0)
-                est_delay = 0;
-        return est_delay;
-}
 /*
 * return the current pcm pointer.  just based on the hwptr_done value.
 */
@@ -74,13 +43,8 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substream
        unsigned int hwptr_done;
        subs = (struct snd_usb_substream *)substream->runtime->private_data;
-        if (subs->stream->chip->shutdown)
-                return SNDRV_PCM_POS_XRUN;
        spin_lock(&subs->lock);
        hwptr_done = subs->hwptr_done;
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                substream->runtime->delay = snd_usb_pcm_delay(subs,
-                                                substream->runtime->rate);
        spin_unlock(&subs->lock);
        return hwptr_done / (substream->runtime->frame_bits >> 3);
 }
@@ -88,7 +52,8 @@ static snd_pcm_uframes_t snd_usb_pcm_pointer(struct snd_pcm_substream *substream
 /*
 * find a matching audio format
 */
-static struct audioformat *find_format(struct snd_usb_substream *subs)
+static struct audioformat *find_format(struct snd_usb_substream *subs, unsigned int format,
+                                       unsigned int rate, unsigned int channels)
 {
        struct list_head *p;
        struct audioformat *found = NULL;
@@ -97,17 +62,16 @@ static struct audioformat *find_format(struct snd_usb_substream *subs)
        list_for_each(p, &subs->fmt_list) {
                struct audioformat *fp;
                fp = list_entry(p, struct audioformat, list);
-                if (!(fp->formats & (1uLL << subs->pcm_format)))
+                if (!(fp->formats & (1uLL << format)))
                        continue;
-                if (fp->channels != subs->channels)
+                if (fp->channels != channels)
                        continue;
-                if (subs->cur_rate < fp->rate_min ||
+                if (rate < fp->rate_min || rate > fp->rate_max)
-                    subs->cur_rate > fp->rate_max)
                        continue;
                if (! (fp->rates & SNDRV_PCM_RATE_CONTINUOUS)) {
                        unsigned int i;
                        for (i = 0; i < fp->nr_rates; i++)
-                                if (fp->rate_table[i] == subs->cur_rate)
+                                if (fp->rate_table[i] == rate)
                                        break;
                        if (i >= fp->nr_rates)
                                continue;
@@ -162,7 +126,7 @@ static int init_pitch_v1(struct snd_usb_audio *chip, int iface,
        if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC_SET_CUR,
                                   USB_TYPE_CLASS|USB_RECIP_ENDPOINT|USB_DIR_OUT,
                                   UAC_EP_CS_ATTR_PITCH_CONTROL << 8, ep,
-                                   data, sizeof(data))) < 0) {
+                                   data, sizeof(data), 1000)) < 0) {
                snd_printk(KERN_ERR "%d:%d:%d: cannot set enable PITCH\n",
                           dev->devnum, iface, ep);
                return err;
@@ -177,13 +141,16 @@ static int init_pitch_v2(struct snd_usb_audio *chip, int iface,
 {
        struct usb_device *dev = chip->dev;
        unsigned char data[1];
+        unsigned int ep;
        int err;
+        ep = get_endpoint(alts, 0)->bEndpointAddress;
        data[0] = 1;
        if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
                                   USB_TYPE_CLASS | USB_RECIP_ENDPOINT | USB_DIR_OUT,
                                   UAC2_EP_CS_PITCH << 8, 0,
-                                   data, sizeof(data))) < 0) {
+                                   data, sizeof(data), 1000)) < 0) {
                snd_printk(KERN_ERR "%d:%d:%d: cannot set enable PITCH (v2)\n",
                           dev->devnum, iface, fmt->altsetting);
                return err;
@@ -215,88 +182,6 @@ int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
        }
 }
-static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep)
-{
-        int err;
-        if (!subs->data_endpoint)
-                return -EINVAL;
-        if (!test_and_set_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags)) {
-                struct snd_usb_endpoint *ep = subs->data_endpoint;
-                snd_printdd(KERN_DEBUG "Starting data EP @%p\n", ep);
-                ep->data_subs = subs;
-                err = snd_usb_endpoint_start(ep, can_sleep);
-                if (err < 0) {
-                        clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags);
-                        return err;
-                }
-        }
-        if (subs->sync_endpoint &&
-            !test_and_set_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags)) {
-                struct snd_usb_endpoint *ep = subs->sync_endpoint;
-                if (subs->data_endpoint->iface != subs->sync_endpoint->iface ||
-                    subs->data_endpoint->alt_idx != subs->sync_endpoint->alt_idx) {
-                        err = usb_set_interface(subs->dev,
-                                                subs->sync_endpoint->iface,
-                                                subs->sync_endpoint->alt_idx);
-                        if (err < 0) {
-                                snd_printk(KERN_ERR
-                                           "%d:%d:%d: cannot set interface (%d)\n",
-                                           subs->dev->devnum,
-                                           subs->sync_endpoint->iface,
-                                           subs->sync_endpoint->alt_idx, err);
-                                return -EIO;
-                        }
-                }
-                snd_printdd(KERN_DEBUG "Starting sync EP @%p\n", ep);
-                ep->sync_slave = subs->data_endpoint;
-                err = snd_usb_endpoint_start(ep, can_sleep);
-                if (err < 0) {
-                        clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags);
-                        return err;
-                }
-        }
-        return 0;
-}
-static void stop_endpoints(struct snd_usb_substream *subs, bool wait)
-{
-        if (test_and_clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags))
-                snd_usb_endpoint_stop(subs->sync_endpoint);
-        if (test_and_clear_bit(SUBSTREAM_FLAG_DATA_EP_STARTED, &subs->flags))
-                snd_usb_endpoint_stop(subs->data_endpoint);
-        if (wait) {
-                snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint);
-                snd_usb_endpoint_sync_pending_stop(subs->data_endpoint);
-        }
-}
-static int deactivate_endpoints(struct snd_usb_substream *subs)
-{
-        int reta, retb;
-        reta = snd_usb_endpoint_deactivate(subs->sync_endpoint);
-        retb = snd_usb_endpoint_deactivate(subs->data_endpoint);
-        if (reta < 0)
-                return reta;
-        if (retb < 0)
-                return retb;
-        return 0;
-}
 /*
 * find a matching format and set up the interface
 */
@@ -308,7 +193,7 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
        struct usb_interface *iface;
        unsigned int ep, attr;
        int is_playback = subs->direction == SNDRV_PCM_STREAM_PLAYBACK;
-        int err, implicit_fb = 0;
+        int err;
        iface = usb_ifnum_to_if(dev, fmt->iface);
        if (WARN_ON(!iface))
@@ -323,10 +208,9 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
        /* close the old interface */
        if (subs->interface >= 0 && subs->interface != fmt->iface) {
-                err = usb_set_interface(subs->dev, subs->interface, 0);
+                if (usb_set_interface(subs->dev, subs->interface, 0) < 0) {
-                if (err < 0) {
+                        snd_printk(KERN_ERR "%d:%d:%d: return to setting 0 failed\n",
-                        snd_printk(KERN_ERR "%d:%d:%d: return to setting 0 failed (%d)\n",
+                                dev->devnum, fmt->iface, fmt->altsetting);
-                                dev->devnum, fmt->iface, fmt->altsetting, err);
                        return -EIO;
                }
                subs->interface = -1;
@@ -334,25 +218,28 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
        }
        /* set interface */
-        if (subs->interface != fmt->iface ||
+        if (subs->interface != fmt->iface || subs->altset_idx != fmt->altset_idx) {
-            subs->altset_idx != fmt->altset_idx) {
+                if (usb_set_interface(dev, fmt->iface, fmt->altsetting) < 0) {
-                err = usb_set_interface(dev, fmt->iface, fmt->altsetting);
+                        snd_printk(KERN_ERR "%d:%d:%d: usb_set_interface failed\n",
-                if (err < 0) {
+                                   dev->devnum, fmt->iface, fmt->altsetting);
-                        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",
+                snd_printdd(KERN_INFO "setting usb interface %d:%d\n", fmt->iface, fmt->altsetting);
-                                fmt->iface, fmt->altsetting);
                subs->interface = fmt->iface;
                subs->altset_idx = fmt->altset_idx;
        }
-        subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip,
+        /* create a data pipe */
-                                                   alts, fmt->endpoint, subs->direction,
+        ep = fmt->endpoint & USB_ENDPOINT_NUMBER_MASK;
-                                                   SND_USB_ENDPOINT_TYPE_DATA);
+        if (is_playback)
-        if (!subs->data_endpoint)
+                subs->datapipe = usb_sndisocpipe(dev, ep);
-                return -EINVAL;
+        else
+                subs->datapipe = usb_rcvisocpipe(dev, ep);
+        subs->datainterval = fmt->datainterval;
+        subs->syncpipe = subs->syncinterval = 0;
+        subs->maxpacksize = fmt->maxpacksize;
+        subs->syncmaxsize = 0;
+        subs->fill_max = 0;
        /* we need a sync pipe in async OUT or adaptive IN mode */
        /* check the number of EP, since some devices have broken
@@ -360,81 +247,52 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
         * assume it as adaptive-out or sync-in.
         */
        attr = fmt->ep_attr & USB_ENDPOINT_SYNCTYPE;
-        switch (subs->stream->chip->usb_id) {
-        case USB_ID(0x0763, 0x2030): /* M-Audio Fast Track C400 */
-                if (is_playback) {
-                        implicit_fb = 1;
-                        ep = 0x81;
-                        iface = usb_ifnum_to_if(dev, 3);
-                        if (!iface || iface->num_altsetting == 0)
-                                return -EINVAL;
-                        alts = &iface->altsetting[1];
-                        goto add_sync_ep;
-                }
-                break;
-        case USB_ID(0x0763, 0x2080): /* M-Audio FastTrack Ultra */
-        case USB_ID(0x0763, 0x2081):
-                if (is_playback) {
-                        implicit_fb = 1;
-                        ep = 0x81;
-                        iface = usb_ifnum_to_if(dev, 2);
-                        if (!iface || iface->num_altsetting == 0)
-                                return -EINVAL;
-                        alts = &iface->altsetting[1];
-                        goto add_sync_ep;
-                }
-        }
        if (((is_playback && attr == USB_ENDPOINT_SYNC_ASYNC) ||
-             (!is_playback && attr == USB_ENDPOINT_SYNC_ADAPTIVE)) &&
+             (! is_playback && attr == USB_ENDPOINT_SYNC_ADAPTIVE)) &&
            altsd->bNumEndpoints >= 2) {
                /* check sync-pipe endpoint */
                /* ... and check descriptor size before accessing bSynchAddress
                   because there is a version of the SB Audigy 2 NX firmware lacking
                   the audio fields in the endpoint descriptors */
-                if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC ||
+                if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != 0x01 ||
                    (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
-                     get_endpoint(alts, 1)->bSynchAddress != 0 &&
+                     get_endpoint(alts, 1)->bSynchAddress != 0)) {
-                     !implicit_fb)) {
+                        snd_printk(KERN_ERR "%d:%d:%d : invalid synch pipe\n",
-                        snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. bmAttributes %02x, bLength %d, bSynchAddress %02x\n",
+                                   dev->devnum, fmt->iface, fmt->altsetting);
-                                   dev->devnum, fmt->iface, fmt->altsetting,
-                                   get_endpoint(alts, 1)->bmAttributes,
-                                   get_endpoint(alts, 1)->bLength,
-                                   get_endpoint(alts, 1)->bSynchAddress);
                        return -EINVAL;
                }
                ep = get_endpoint(alts, 1)->bEndpointAddress;
-                if (!implicit_fb &&
+                if (get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
-                    get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
                    (( is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) ||
                     (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) {
-                        snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n",
+                        snd_printk(KERN_ERR "%d:%d:%d : invalid synch pipe\n",
-                                   dev->devnum, fmt->iface, fmt->altsetting,
+                                   dev->devnum, fmt->iface, fmt->altsetting);
-                                   is_playback, ep, get_endpoint(alts, 0)->bSynchAddress);
                        return -EINVAL;
                }
+                ep &= USB_ENDPOINT_NUMBER_MASK;
-                implicit_fb = (get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_USAGE_MASK)
+                if (is_playback)
-                                == USB_ENDPOINT_USAGE_IMPLICIT_FB;
+                        subs->syncpipe = usb_rcvisocpipe(dev, ep);
+                else
-add_sync_ep:
+                        subs->syncpipe = usb_sndisocpipe(dev, ep);
-                subs->sync_endpoint = snd_usb_add_endpoint(subs->stream->chip,
+                if (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
-                                                           alts, ep, !subs->direction,
+                    get_endpoint(alts, 1)->bRefresh >= 1 &&
-                                                           implicit_fb ?
+                    get_endpoint(alts, 1)->bRefresh <= 9)
-                                                                SND_USB_ENDPOINT_TYPE_DATA :
+                        subs->syncinterval = get_endpoint(alts, 1)->bRefresh;
-                                                                SND_USB_ENDPOINT_TYPE_SYNC);
+                else if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
-                if (!subs->sync_endpoint)
+                        subs->syncinterval = 1;
-                        return -EINVAL;
+                else if (get_endpoint(alts, 1)->bInterval >= 1 &&
+                         get_endpoint(alts, 1)->bInterval <= 16)
-                subs->data_endpoint->sync_master = subs->sync_endpoint;
+                        subs->syncinterval = get_endpoint(alts, 1)->bInterval - 1;
+                else
+                        subs->syncinterval = 3;
+                subs->syncmaxsize = le16_to_cpu(get_endpoint(alts, 1)->wMaxPacketSize);
        }
-        if ((err = snd_usb_init_pitch(subs->stream->chip, fmt->iface, alts, fmt)) < 0)
+        /* always fill max packet size */
+        if (fmt->attributes & UAC_EP_CS_ATTR_FILL_MAX)
+                subs->fill_max = 1;
+        if ((err = snd_usb_init_pitch(subs->stream->chip, subs->interface, alts, fmt)) < 0)
                return err;
        subs->cur_audiofmt = fmt;
@@ -454,140 +312,6 @@ add_sync_ep:
 }
 /*
- * Return the score of matching two audioformats.
- * Veto the audioformat if:
- * - It has no channels for some reason.
- * - Requested PCM format is not supported.
- * - Requested sample rate is not supported.
- */
-static int match_endpoint_audioformats(struct audioformat *fp,
-        struct audioformat *match, int rate,
-        snd_pcm_format_t pcm_format)
-{
-        int i;
-        int score = 0;
-        if (fp->channels < 1) {
-                snd_printdd("%s: (fmt @%p) no channels\n", __func__, fp);
-                return 0;
-        }
-        if (!(fp->formats & (1ULL << pcm_format))) {
-                snd_printdd("%s: (fmt @%p) no match for format %d\n", __func__,
-                        fp, pcm_format);
-                return 0;
-        }
-        for (i = 0; i < fp->nr_rates; i++) {
-                if (fp->rate_table[i] == rate) {
-                        score++;
-                        break;
-                }
-        }
-        if (!score) {
-                snd_printdd("%s: (fmt @%p) no match for rate %d\n", __func__,
-                        fp, rate);
-                return 0;
-        }
-        if (fp->channels == match->channels)
-                score++;
-        snd_printdd("%s: (fmt @%p) score %d\n", __func__, fp, score);
-        return score;
-}
-/*
- * Configure the sync ep using the rate and pcm format of the data ep.
- */
-static int configure_sync_endpoint(struct snd_usb_substream *subs)
-{
-        int ret;
-        struct audioformat *fp;
-        struct audioformat *sync_fp = NULL;
-        int cur_score = 0;
-        int sync_period_bytes = subs->period_bytes;
-        struct snd_usb_substream *sync_subs =
-                &subs->stream->substream[subs->direction ^ 1];
-        if (subs->sync_endpoint->type != SND_USB_ENDPOINT_TYPE_DATA ||
-            !subs->stream)
-                return snd_usb_endpoint_set_params(subs->sync_endpoint,
-                                                   subs->pcm_format,
-                                                   subs->channels,
-                                                   subs->period_bytes,
-                                                   subs->cur_rate,
-                                                   subs->cur_audiofmt,
-                                                   NULL);
-        /* Try to find the best matching audioformat. */
-        list_for_each_entry(fp, &sync_subs->fmt_list, list) {
-                int score = match_endpoint_audioformats(fp, subs->cur_audiofmt,
-                        subs->cur_rate, subs->pcm_format);
-                if (score > cur_score) {
-                        sync_fp = fp;
-                        cur_score = score;
-                }
-        }
-        if (unlikely(sync_fp == NULL)) {
-                snd_printk(KERN_ERR "%s: no valid audioformat for sync ep %x found\n",
-                        __func__, sync_subs->ep_num);
-                return -EINVAL;
-        }
-        /*
-         * Recalculate the period bytes if channel number differ between
-         * data and sync ep audioformat.
-         */
-        if (sync_fp->channels != subs->channels) {
-                sync_period_bytes = (subs->period_bytes / subs->channels) *
-                        sync_fp->channels;
-                snd_printdd("%s: adjusted sync ep period bytes (%d -> %d)\n",
-                        __func__, subs->period_bytes, sync_period_bytes);
-        }
-        ret = snd_usb_endpoint_set_params(subs->sync_endpoint,
-                                          subs->pcm_format,
-                                          sync_fp->channels,
-                                          sync_period_bytes,
-                                          subs->cur_rate,
-                                          sync_fp,
-                                          NULL);
-        return ret;
-}
-/*
- * configure endpoint params
- *
- * called  during initial setup and upon resume
- */
-static int configure_endpoint(struct snd_usb_substream *subs)
-{
-        int ret;
-        /* format changed */
-        stop_endpoints(subs, true);
-        ret = snd_usb_endpoint_set_params(subs->data_endpoint,
-                                          subs->pcm_format,
-                                          subs->channels,
-                                          subs->period_bytes,
-                                          subs->cur_rate,
-                                          subs->cur_audiofmt,
-                                          subs->sync_endpoint);
-        if (ret < 0)
-                return ret;
-        if (subs->sync_endpoint)
-                ret = configure_sync_endpoint(subs);
-        return ret;
-}
-/*
 * hw_params callback
 *
 * allocate a buffer and set the given audio format.
@@ -602,39 +326,54 @@ static int snd_usb_hw_params(struct snd_pcm_substream *substream,
 {
        struct snd_usb_substream *subs = substream->runtime->private_data;
        struct audioformat *fmt;
-        int ret;
+        unsigned int channels, rate, format;
+        int ret, changed;
        ret = snd_pcm_lib_alloc_vmalloc_buffer(substream,
                                               params_buffer_bytes(hw_params));
        if (ret < 0)
                return ret;
-        subs->pcm_format = params_format(hw_params);
+        format = params_format(hw_params);
-        subs->period_bytes = params_period_bytes(hw_params);
+        rate = params_rate(hw_params);
-        subs->channels = params_channels(hw_params);
+        channels = params_channels(hw_params);
-        subs->cur_rate = params_rate(hw_params);
+        fmt = find_format(subs, format, rate, channels);
-        fmt = find_format(subs);
        if (!fmt) {
                snd_printd(KERN_DEBUG "cannot set format: format = %#x, rate = %d, channels = %d\n",
-                           subs->pcm_format, subs->cur_rate, subs->channels);
+                           format, rate, channels);
                return -EINVAL;
        }
-        down_read(&subs->stream->chip->shutdown_rwsem);
+        changed = subs->cur_audiofmt != fmt ||
-        if (subs->stream->chip->shutdown)
+                subs->period_bytes != params_period_bytes(hw_params) ||
-                ret = -ENODEV;
+                subs->cur_rate != rate;
-        else
+        if ((ret = set_format(subs, fmt)) < 0)
-                ret = set_format(subs, fmt);
-        up_read(&subs->stream->chip->shutdown_rwsem);
-        if (ret < 0)
                return ret;
-        subs->interface = fmt->iface;
+        if (subs->cur_rate != rate) {
-        subs->altset_idx = fmt->altset_idx;
+                struct usb_host_interface *alts;
-        subs->need_setup_ep = true;
+                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);
+                if (ret < 0)
+                        return ret;
+                subs->cur_rate = rate;
+        }
-        return 0;
+        if (changed) {
+                mutex_lock(&subs->stream->chip->shutdown_mutex);
+                /* format changed */
+                snd_usb_release_substream_urbs(subs, 0);
+                /* influenced: period_bytes, channels, rate, format, */
+                ret = snd_usb_init_substream_urbs(subs, params_period_bytes(hw_params),
+                                                  params_rate(hw_params),
+                                                  snd_pcm_format_physical_width(params_format(hw_params)) *
+                                                        params_channels(hw_params));
+                mutex_unlock(&subs->stream->chip->shutdown_mutex);
+        }
+        return ret;
 }
 /*
@@ -649,12 +388,9 @@ static int snd_usb_hw_free(struct snd_pcm_substream *substream)
        subs->cur_audiofmt = NULL;
        subs->cur_rate = 0;
        subs->period_bytes = 0;
-        down_read(&subs->stream->chip->shutdown_rwsem);
+        mutex_lock(&subs->stream->chip->shutdown_mutex);
-        if (!subs->stream->chip->shutdown) {
+        snd_usb_release_substream_urbs(subs, 0);
-                stop_endpoints(subs, true);
+        mutex_unlock(&subs->stream->chip->shutdown_mutex);
-                deactivate_endpoints(subs);
-        }
-        up_read(&subs->stream->chip->shutdown_rwsem);
        return snd_pcm_lib_free_vmalloc_buffer(substream);
 }
@@ -667,70 +403,23 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
 {
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct snd_usb_substream *subs = runtime->private_data;
-        struct usb_host_interface *alts;
-        struct usb_interface *iface;
-        int ret;
        if (! subs->cur_audiofmt) {
                snd_printk(KERN_ERR "usbaudio: no format is specified!\n");
                return -ENXIO;
        }
-        down_read(&subs->stream->chip->shutdown_rwsem);
-        if (subs->stream->chip->shutdown) {
-                ret = -ENODEV;
-                goto unlock;
-        }
-        if (snd_BUG_ON(!subs->data_endpoint)) {
-                ret = -EIO;
-                goto unlock;
-        }
-        snd_usb_endpoint_sync_pending_stop(subs->sync_endpoint);
-        snd_usb_endpoint_sync_pending_stop(subs->data_endpoint);
-        ret = set_format(subs, subs->cur_audiofmt);
-        if (ret < 0)
-                goto unlock;
-        iface = usb_ifnum_to_if(subs->dev, subs->cur_audiofmt->iface);
-        alts = &iface->altsetting[subs->cur_audiofmt->altset_idx];
-        ret = snd_usb_init_sample_rate(subs->stream->chip,
-                                       subs->cur_audiofmt->iface,
-                                       alts,
-                                       subs->cur_audiofmt,
-                                       subs->cur_rate);
-        if (ret < 0)
-                goto unlock;
-        if (subs->need_setup_ep) {
-                ret = configure_endpoint(subs);
-                if (ret < 0)
-                        goto unlock;
-                subs->need_setup_ep = false;
-        }
        /* some unit conversions in runtime */
-        subs->data_endpoint->maxframesize =
+        subs->maxframesize = bytes_to_frames(runtime, subs->maxpacksize);
-                bytes_to_frames(runtime, subs->data_endpoint->maxpacksize);
+        subs->curframesize = bytes_to_frames(runtime, subs->curpacksize);
-        subs->data_endpoint->curframesize =
-                bytes_to_frames(runtime, subs->data_endpoint->curpacksize);
        /* reset the pointer */
        subs->hwptr_done = 0;
        subs->transfer_done = 0;
-        subs->last_delay = 0;
+        subs->phase = 0;
-        subs->last_frame_number = 0;
        runtime->delay = 0;
-        /* for playback, submit the URBs now; otherwise, the first hwptr_done
+        return snd_usb_substream_prepare(subs, runtime);
-         * updates for all URBs would happen at the same time when starting */
-        if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK)
-                ret = start_endpoints(subs, true);
- unlock:
-        up_read(&subs->stream->chip->shutdown_rwsem);
-        return ret;
 }
 static struct snd_pcm_hardware snd_usb_hardware =
@@ -783,7 +472,7 @@ static int hw_check_valid_format(struct snd_usb_substream *subs,
                return 0;
        }
        /* check whether the period time is >= the data packet interval */
-        if (subs->speed != USB_SPEED_FULL) {
+        if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL) {
                ptime = 125 * (1 << fp->datainterval);
                if (ptime > pt->max || (ptime == pt->max && pt->openmax)) {
                        hwc_debug("   > check: ptime %u > max %u\n", ptime, pt->max);
@@ -978,13 +667,9 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
                                  struct snd_usb_substream *subs)
 {
        struct audioformat *fp;
-        int *rate_list;
        int count = 0, needs_knot = 0;
        int err;
-        kfree(subs->rate_list.list);
-        subs->rate_list.list = NULL;
        list_for_each_entry(fp, &subs->fmt_list, list) {
                if (fp->rates & SNDRV_PCM_RATE_CONTINUOUS)
                        return 0;
@@ -995,8 +680,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
        if (!needs_knot)
                return 0;
-        subs->rate_list.list = rate_list =
+        subs->rate_list.list = kmalloc(sizeof(int) * count, GFP_KERNEL);
-                kmalloc(sizeof(int) * count, GFP_KERNEL);
        if (!subs->rate_list.list)
                return -ENOMEM;
        subs->rate_list.count = count;
@@ -1005,7 +689,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
        list_for_each_entry(fp, &subs->fmt_list, list) {
                int i;
                for (i = 0; i < fp->nr_rates; i++)
-                        rate_list[count++] = fp->rate_table[i];
+                        subs->rate_list.list[count++] = fp->rate_table[i];
        }
        err = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
                                         &subs->rate_list);
@@ -1061,7 +745,7 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre
                return err;
        param_period_time_if_needed = SNDRV_PCM_HW_PARAM_PERIOD_TIME;
-        if (subs->speed == USB_SPEED_FULL)
+        if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL)
                /* full speed devices have fixed data packet interval */
                ptmin = 1000;
        if (ptmin == 1000)
@@ -1131,220 +815,15 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream, int direction)
        struct snd_usb_stream *as = snd_pcm_substream_chip(substream);
        struct snd_usb_substream *subs = &as->substream[direction];
-        stop_endpoints(subs, true);
        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 0;
 }
-/* Since a URB can handle only a single linear buffer, we must use double
- * buffering when the data to be transferred overflows the buffer boundary.
- * To avoid inconsistencies when updating hwptr_done, we use double buffering
- * for all URBs.
- */
-static void retire_capture_urb(struct snd_usb_substream *subs,
-                               struct urb *urb)
-{
-        struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
-        unsigned int stride, frames, bytes, oldptr;
-        int i, period_elapsed = 0;
-        unsigned long flags;
-        unsigned char *cp;
-        stride = runtime->frame_bits >> 3;
-        for (i = 0; i < urb->number_of_packets; i++) {
-                cp = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
-                if (urb->iso_frame_desc[i].status && printk_ratelimit()) {
-                        snd_printdd(KERN_ERR "frame %d active: %d\n", i, urb->iso_frame_desc[i].status);
-                        // continue;
-                }
-                bytes = urb->iso_frame_desc[i].actual_length;
-                frames = bytes / stride;
-                if (!subs->txfr_quirk)
-                        bytes = frames * stride;
-                if (bytes % (runtime->sample_bits >> 3) != 0) {
-#ifdef CONFIG_SND_DEBUG_VERBOSE
-                        int oldbytes = bytes;
-#endif
-                        bytes = frames * stride;
-                        snd_printdd(KERN_ERR "Corrected urb data len. %d->%d\n",
-                                                        oldbytes, bytes);
-                }
-                /* update the current pointer */
-                spin_lock_irqsave(&subs->lock, flags);
-                oldptr = subs->hwptr_done;
-                subs->hwptr_done += bytes;
-                if (subs->hwptr_done >= runtime->buffer_size * stride)
-                        subs->hwptr_done -= runtime->buffer_size * stride;
-                frames = (bytes + (oldptr % stride)) / stride;
-                subs->transfer_done += frames;
-                if (subs->transfer_done >= runtime->period_size) {
-                        subs->transfer_done -= runtime->period_size;
-                        period_elapsed = 1;
-                }
-                spin_unlock_irqrestore(&subs->lock, flags);
-                /* copy a data chunk */
-                if (oldptr + bytes > runtime->buffer_size * stride) {
-                        unsigned int bytes1 =
-                                        runtime->buffer_size * stride - oldptr;
-                        memcpy(runtime->dma_area + oldptr, cp, bytes1);
-                        memcpy(runtime->dma_area, cp + bytes1, bytes - bytes1);
-                } else {
-                        memcpy(runtime->dma_area + oldptr, cp, bytes);
-                }
-        }
-        if (period_elapsed)
-                snd_pcm_period_elapsed(subs->pcm_substream);
-}
-static void prepare_playback_urb(struct snd_usb_substream *subs,
-                                 struct urb *urb)
-{
-        struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
-        struct snd_usb_endpoint *ep = subs->data_endpoint;
-        struct snd_urb_ctx *ctx = urb->context;
-        unsigned int counts, frames, bytes;
-        int i, stride, period_elapsed = 0;
-        unsigned long flags;
-        stride = runtime->frame_bits >> 3;
-        frames = 0;
-        urb->number_of_packets = 0;
-        spin_lock_irqsave(&subs->lock, flags);
-        for (i = 0; i < ctx->packets; i++) {
-                if (ctx->packet_size[i])
-                        counts = ctx->packet_size[i];
-                else
-                        counts = snd_usb_endpoint_next_packet_size(ep);
-                /* set up descriptor */
-                urb->iso_frame_desc[i].offset = frames * stride;
-                urb->iso_frame_desc[i].length = counts * stride;
-                frames += counts;
-                urb->number_of_packets++;
-                subs->transfer_done += counts;
-                if (subs->transfer_done >= runtime->period_size) {
-                        subs->transfer_done -= runtime->period_size;
-                        period_elapsed = 1;
-                        if (subs->fmt_type == UAC_FORMAT_TYPE_II) {
-                                if (subs->transfer_done > 0) {
-                                        /* FIXME: fill-max mode is not
-                                         * supported yet */
-                                        frames -= subs->transfer_done;
-                                        counts -= subs->transfer_done;
-                                        urb->iso_frame_desc[i].length =
-                                                counts * stride;
-                                        subs->transfer_done = 0;
-                                }
-                                i++;
-                                if (i < ctx->packets) {
-                                        /* add a transfer delimiter */
-                                        urb->iso_frame_desc[i].offset =
-                                                frames * stride;
-                                        urb->iso_frame_desc[i].length = 0;
-                                        urb->number_of_packets++;
-                                }
-                                break;
-                        }
-                }
-                if (period_elapsed &&
-                    !snd_usb_endpoint_implict_feedback_sink(subs->data_endpoint)) /* finish at the period boundary */
-                        break;
-        }
-        bytes = frames * stride;
-        if (subs->hwptr_done + bytes > runtime->buffer_size * stride) {
-                /* err, the transferred area goes over buffer boundary. */
-                unsigned int bytes1 =
-                        runtime->buffer_size * stride - subs->hwptr_done;
-                memcpy(urb->transfer_buffer,
-                       runtime->dma_area + subs->hwptr_done, bytes1);
-                memcpy(urb->transfer_buffer + bytes1,
-                       runtime->dma_area, bytes - bytes1);
-        } else {
-                memcpy(urb->transfer_buffer,
-                       runtime->dma_area + subs->hwptr_done, bytes);
-        }
-        subs->hwptr_done += bytes;
-        if (subs->hwptr_done >= runtime->buffer_size * stride)
-                subs->hwptr_done -= runtime->buffer_size * stride;
-        /* update delay with exact number of samples queued */
-        runtime->delay = subs->last_delay;
-        runtime->delay += frames;
-        subs->last_delay = runtime->delay;
-        /* realign last_frame_number */
-        subs->last_frame_number = usb_get_current_frame_number(subs->dev);
-        subs->last_frame_number &= 0xFF; /* keep 8 LSBs */
-        spin_unlock_irqrestore(&subs->lock, flags);
-        urb->transfer_buffer_length = bytes;
-        if (period_elapsed)
-                snd_pcm_period_elapsed(subs->pcm_substream);
-}
-/*
- * process after playback data complete
- * - decrease the delay count again
- */
-static void retire_playback_urb(struct snd_usb_substream *subs,
-                               struct urb *urb)
-{
-        unsigned long flags;
-        struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime;
-        int stride = runtime->frame_bits >> 3;
-        int processed = urb->transfer_buffer_length / stride;
-        int est_delay;
-        /* ignore the delay accounting when procssed=0 is given, i.e.
-         * silent payloads are procssed before handling the actual data
-         */
-        if (!processed)
-                return;
-        spin_lock_irqsave(&subs->lock, flags);
-        if (!subs->last_delay)
-                goto out; /* short path */
-        est_delay = snd_usb_pcm_delay(subs, runtime->rate);
-        /* update delay with exact number of samples played */
-        if (processed > subs->last_delay)
-                subs->last_delay = 0;
-        else
-                subs->last_delay -= processed;
-        runtime->delay = subs->last_delay;
-        /*
-         * Report when delay estimate is off by more than 2ms.
-         * The error should be lower than 2ms since the estimate relies
-         * on two reads of a counter updated every ms.
-         */
-        if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2)
-                snd_printk(KERN_DEBUG "delay: estimated %d, actual %d\n",
-                        est_delay, subs->last_delay);
-        if (!subs->running) {
-                /* update last_frame_number for delay counting here since
-                 * prepare_playback_urb won't be called during pause
-                 */
-                subs->last_frame_number =
-                        usb_get_current_frame_number(subs->dev) & 0xff;
-        }
- out:
-        spin_unlock_irqrestore(&subs->lock, flags);
-}
 static int snd_usb_playback_open(struct snd_pcm_substream *substream)
 {
        return snd_usb_pcm_open(substream, SNDRV_PCM_STREAM_PLAYBACK);
@@ -1365,65 +844,6 @@ static int snd_usb_capture_close(struct snd_pcm_substream *substream)
        return snd_usb_pcm_close(substream, SNDRV_PCM_STREAM_CAPTURE);
 }
-static int snd_usb_substream_playback_trigger(struct snd_pcm_substream *substream,
-                                              int cmd)
-{
-        struct snd_usb_substream *subs = substream->runtime->private_data;
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                subs->data_endpoint->prepare_data_urb = prepare_playback_urb;
-                subs->data_endpoint->retire_data_urb = retire_playback_urb;
-                subs->running = 1;
-                return 0;
-        case SNDRV_PCM_TRIGGER_STOP:
-                stop_endpoints(subs, false);
-                subs->running = 0;
-                return 0;
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                subs->data_endpoint->prepare_data_urb = NULL;
-                /* keep retire_data_urb for delay calculation */
-                subs->data_endpoint->retire_data_urb = retire_playback_urb;
-                subs->running = 0;
-                return 0;
-        }
-        return -EINVAL;
-}
-static int snd_usb_substream_capture_trigger(struct snd_pcm_substream *substream,
-                                             int cmd)
-{
-        int err;
-        struct snd_usb_substream *subs = substream->runtime->private_data;
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                err = start_endpoints(subs, false);
-                if (err < 0)
-                        return err;
-                subs->data_endpoint->retire_data_urb = retire_capture_urb;
-                subs->running = 1;
-                return 0;
-        case SNDRV_PCM_TRIGGER_STOP:
-                stop_endpoints(subs, false);
-                subs->running = 0;
-                return 0;
-        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                subs->data_endpoint->retire_data_urb = NULL;
-                subs->running = 0;
-                return 0;
-        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                subs->data_endpoint->retire_data_urb = retire_capture_urb;
-                subs->running = 1;
-                return 0;
-        }
-        return -EINVAL;
-}
 static struct snd_pcm_ops snd_usb_playback_ops = {
        .open =         snd_usb_playback_open,
        .close =        snd_usb_playback_close,
diff --git a/sound/usb/pcm.h b/sound/usb/pcm.h
index df7a003682a..ed3e283f618 100644
--- a/sound/usb/pcm.h
+++ b/sound/usb/pcm.h
@@ -1,9 +1,6 @@
 #ifndef __USBAUDIO_PCM_H
 #define __USBAUDIO_PCM_H
-snd_pcm_uframes_t snd_usb_pcm_delay(struct snd_usb_substream *subs,
-                                    unsigned int rate);
 void snd_usb_set_pcm_ops(struct snd_pcm *pcm, int stream);
 int snd_usb_init_pitch(struct snd_usb_audio *chip, int iface,
diff --git a/sound/usb/proc.c b/sound/usb/proc.c
index d218f763501..961c9a25068 100644
--- a/sound/usb/proc.c
+++ b/sound/usb/proc.c
@@ -25,7 +25,6 @@
 #include "usbaudio.h"
 #include "helper.h"
 #include "card.h"
-#include "endpoint.h"
 #include "proc.h"
 /* convert our full speed USB rate into sampling rate in Hz */
@@ -108,7 +107,7 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s
                        }
                        snd_iprintf(buffer, "\n");
                }
-                if (subs->speed != USB_SPEED_FULL)
+                if (snd_usb_get_speed(subs->dev) != USB_SPEED_FULL)
                        snd_iprintf(buffer, "    Data packet interval: %d us\n",
                                    125 * (1 << fp->datainterval));
                // snd_iprintf(buffer, "    Max Packet Size = %d\n", fp->maxpacksize);
@@ -116,33 +115,28 @@ static void proc_dump_substream_formats(struct snd_usb_substream *subs, struct s
        }
 }
-static void proc_dump_ep_status(struct snd_usb_substream *subs,
-                                struct snd_usb_endpoint *ep,
-                                struct snd_info_buffer *buffer)
-{
-        if (!ep)
-                return;
-        snd_iprintf(buffer, "    Packet Size = %d\n", ep->curpacksize);
-        snd_iprintf(buffer, "    Momentary freq = %u Hz (%#x.%04x)\n",
-                    subs->speed == USB_SPEED_FULL
-                    ? get_full_speed_hz(ep->freqm)
-                    : get_high_speed_hz(ep->freqm),
-                    ep->freqm >> 16, ep->freqm & 0xffff);
-        if (ep->freqshift != INT_MIN) {
-                int res = 16 - ep->freqshift;
-                snd_iprintf(buffer, "    Feedback Format = %d.%d\n",
-                            (ep->syncmaxsize > 3 ? 32 : 24) - res, res);
-        }
-}
 static void proc_dump_substream_status(struct snd_usb_substream *subs, struct snd_info_buffer *buffer)
 {
        if (subs->running) {
+                unsigned int i;
                snd_iprintf(buffer, "  Status: Running\n");
                snd_iprintf(buffer, "    Interface = %d\n", subs->interface);
                snd_iprintf(buffer, "    Altset = %d\n", subs->altset_idx);
-                proc_dump_ep_status(subs, subs->data_endpoint, buffer);
+                snd_iprintf(buffer, "    URBs = %d [ ", subs->nurbs);
-                proc_dump_ep_status(subs, subs->sync_endpoint, buffer);
+                for (i = 0; i < subs->nurbs; i++)
+                        snd_iprintf(buffer, "%d ", subs->dataurb[i].packets);
+                snd_iprintf(buffer, "]\n");
+                snd_iprintf(buffer, "    Packet Size = %d\n", subs->curpacksize);
+                snd_iprintf(buffer, "    Momentary freq = %u Hz (%#x.%04x)\n",
+                            snd_usb_get_speed(subs->dev) == USB_SPEED_FULL
+                            ? get_full_speed_hz(subs->freqm)
+                            : get_high_speed_hz(subs->freqm),
+                            subs->freqm >> 16, subs->freqm & 0xffff);
+                if (subs->freqshift != INT_MIN)
+                        snd_iprintf(buffer, "    Feedback Format = %d.%d\n",
+                                    (subs->syncmaxsize > 3 ? 32 : 24)
+                                                - (16 - subs->freqshift),
+                                    16 - subs->freqshift);
        } else {
                snd_iprintf(buffer, "  Status: Stop\n");
        }
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 78e845ec65d..a42e3ef3832 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -39,39 +39,6 @@
        .idProduct = prod, \
        .bInterfaceClass = USB_CLASS_VENDOR_SPEC
-/* FTDI devices */
-{
-        USB_DEVICE(0x0403, 0xb8d8),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                /* .vendor_name = "STARR LABS", */
-                /* .product_name = "Starr Labs MIDI USB device", */
-                .ifnum = 0,
-                .type = QUIRK_MIDI_FTDI
-        }
-},
-{
-        /* Creative BT-D1 */
-        USB_DEVICE(0x041e, 0x0005),
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .ifnum = 1,
-                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                .data = &(const struct audioformat) {
-                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                        .channels = 2,
-                        .iface = 1,
-                        .altsetting = 1,
-                        .altset_idx = 1,
-                        .endpoint = 0x03,
-                        .ep_attr = USB_ENDPOINT_XFER_ISOC,
-                        .attributes = 0,
-                        .rates = SNDRV_PCM_RATE_CONTINUOUS,
-                        .rate_min = 48000,
-                        .rate_max = 48000,
-                }
-        }
-},
 /* Creative/Toshiba Multimedia Center SB-0500 */
 {
        USB_DEVICE(0x041e, 0x3048),
@@ -121,42 +88,6 @@
 },
 /*
- * HP Wireless Audio
- * When not ignored, causes instability issues for some users, forcing them to
- * blacklist the entire module.
- */
-{
-        USB_DEVICE(0x0424, 0xb832),
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Standard Microsystems Corp.",
-                .product_name = "HP Wireless Audio",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = (const struct snd_usb_audio_quirk[]) {
-                        /* Mixer */
-                        {
-                                .ifnum = 0,
-                                .type = QUIRK_IGNORE_INTERFACE,
-                        },
-                        /* Playback */
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_IGNORE_INTERFACE,
-                        },
-                        /* Capture */
-                        {
-                                .ifnum = 2,
-                                .type = QUIRK_IGNORE_INTERFACE,
-                        },
-                        /* HID Device, .ifnum = 3 */
-                        {
-                                .ifnum = -1,
-                        }
-                }
-        }
-},
-/*
 * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface
 * class matches do not take effect without an explicit ID match.
 */
@@ -327,32 +258,6 @@ YAMAHA_DEVICE(0x105a, NULL),
 YAMAHA_DEVICE(0x105b, NULL),
 YAMAHA_DEVICE(0x105c, NULL),
 YAMAHA_DEVICE(0x105d, NULL),
-{
-        USB_DEVICE(0x0499, 0x1503),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                /* .vendor_name = "Yamaha", */
-                /* .product_name = "MOX6/MOX8", */
-                .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_YAMAHA
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
 YAMAHA_DEVICE(0x2000, "DGP-7"),
 YAMAHA_DEVICE(0x2001, "DGP-5"),
 YAMAHA_DEVICE(0x2002, NULL),
@@ -1515,40 +1420,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-        /* Advanced mode of the Roland VG-99, with MIDI and 24-bit PCM at 44.1
-         * kHz. In standard mode, the device has ID 0582:00b3, and offers
-         * 16-bit PCM at 44.1 kHz with no MIDI.
-         */
-        USB_DEVICE(0x0582, 0x00b2),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                .vendor_name = "Roland",
-                .product_name = "VG-99",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = (const struct snd_usb_audio_quirk[]) {
-                        {
-                                .ifnum = 0,
-                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                        },
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                        },
-                        {
-                                .ifnum = 2,
-                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                                .data = & (const struct snd_usb_midi_endpoint_info) {
-                                        .out_cables = 0x0003,
-                                        .in_cables  = 0x0003
-                                }
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
-{
        /* Roland SonicCell */
        USB_DEVICE(0x0582, 0x00c2),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1710,14 +1581,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-        /* Edirol UM-3G */
-        USB_DEVICE_VENDOR_SPEC(0x0582, 0x0108),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                .ifnum = 0,
-                .type = QUIRK_MIDI_STANDARD_INTERFACE
-        }
-},
-{
        /* Boss JS-8 Jam Station  */
        USB_DEVICE(0x0582, 0x0109),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1759,37 +1622,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-        /* Roland GAIA SH-01 */
-        USB_DEVICE(0x0582, 0x0111),
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Roland",
-                .product_name = "GAIA",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = (const struct snd_usb_audio_quirk[]) {
-                        {
-                                .ifnum = 0,
-                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                        },
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                        },
-                        {
-                                .ifnum = 2,
-                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                                .data = &(const struct snd_usb_midi_endpoint_info) {
-                                .out_cables = 0x0003,
-                                .in_cables  = 0x0003
-                                }
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
-{
        USB_DEVICE(0x0582, 0x0113),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                /* .vendor_name = "BOSS", */
@@ -1846,20 +1678,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-        /* Added support for Roland UM-ONE which differs from UM-1 */
-        USB_DEVICE(0x0582, 0x012a),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                /* .vendor_name = "ROLAND", */
-                /* .product_name = "UM-ONE", */
-                .ifnum = 0,
-                .type = QUIRK_MIDI_FIXED_ENDPOINT,
-                .data = & (const struct snd_usb_midi_endpoint_info) {
-                        .out_cables = 0x0001,
-                        .in_cables  = 0x0003
-                }
-        }
-},
-{
        USB_DEVICE(0x0582, 0x011e),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                /* .vendor_name = "BOSS", */
@@ -1923,36 +1741,6 @@ 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 */
 {
@@ -2255,77 +2043,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 {
-        USB_DEVICE_VENDOR_SPEC(0x0763, 0x2030),
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                /* .vendor_name = "M-Audio", */
-                /* .product_name = "Fast Track C400", */
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = &(const struct snd_usb_audio_quirk[]) {
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_STANDARD_MIXER,
-                        },
-                        /* Playback */
-                        {
-                                .ifnum = 2,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-                                        .channels = 6,
-                                        .iface = 2,
-                                        .altsetting = 1,
-                                        .altset_idx = 1,
-                                        .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
-                                        .endpoint = 0x01,
-                                        .ep_attr = 0x09,
-                                        .rates = SNDRV_PCM_RATE_44100 |
-                                                 SNDRV_PCM_RATE_48000 |
-                                                 SNDRV_PCM_RATE_88200 |
-                                                 SNDRV_PCM_RATE_96000,
-                                        .rate_min = 44100,
-                                        .rate_max = 96000,
-                                        .nr_rates = 4,
-                                        .rate_table = (unsigned int[]) {
-                                                        44100, 48000, 88200, 96000
-                                        },
-                                        .clock = 0x81,
-                                }
-                        },
-                        /* Capture */
-                        {
-                                .ifnum = 3,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-                                        .channels = 4,
-                                        .iface = 3,
-                                        .altsetting = 1,
-                                        .altset_idx = 1,
-                                        .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
-                                        .endpoint = 0x81,
-                                        .ep_attr = 0x05,
-                                        .rates = SNDRV_PCM_RATE_44100 |
-                                                 SNDRV_PCM_RATE_48000 |
-                                                 SNDRV_PCM_RATE_88200 |
-                                                 SNDRV_PCM_RATE_96000,
-                                        .rate_min = 44100,
-                                        .rate_max = 96000,
-                                        .nr_rates = 4,
-                                        .rate_table = (unsigned int[]) {
-                                                44100, 48000, 88200, 96000
-                                        },
-                                        .clock = 0x81,
-                                }
-                        },
-                        /* MIDI */
-                        {
-                                .ifnum = -1 /* Interface = 4 */
-                        }
-                }
-        }
-},
-{
        USB_DEVICE_VENDOR_SPEC(0x0763, 0x2080),
        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
                /* .vendor_name = "M-Audio", */
@@ -2563,16 +2280,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
-{
-        USB_DEVICE_VENDOR_SPEC(0x0944, 0x0201),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                .vendor_name = "KORG, Inc.",
-                /* .product_name = "ToneLab ST", */
-                .ifnum = 3,
-                .type = QUIRK_MIDI_STANDARD_INTERFACE,
-        }
-},
 /* AKAI devices */
 {
        USB_DEVICE(0x09e8, 0x0062),
@@ -2944,285 +2651,6 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
-/* DIGIDESIGN MBOX 2 */
-{
-        USB_DEVICE(0x0dba, 0x3000),
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Digidesign",
-                .product_name = "Mbox 2",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = (const struct snd_usb_audio_quirk[]) {
-                        {
-                                .ifnum = 0,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 2,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S24_3BE,
-                                        .channels = 2,
-                                        .iface = 2,
-                                        .altsetting = 2,
-                                        .altset_idx = 1,
-                                        .attributes = 0x00,
-                                        .endpoint = 0x03,
-                                        .ep_attr = USB_ENDPOINT_SYNC_ASYNC,
-                                        .maxpacksize = 0x128,
-                                        .rates = SNDRV_PCM_RATE_48000,
-                                        .rate_min = 48000,
-                                        .rate_max = 48000,
-                                        .nr_rates = 1,
-                                        .rate_table = (unsigned int[]) {
-                                                48000
-                                        }
-                                }
-                        },
-                        {
-                                .ifnum = 3,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 4,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                .formats = SNDRV_PCM_FMTBIT_S24_3BE,
-                                        .channels = 2,
-                                        .iface = 4,
-                                        .altsetting = 2,
-                                        .altset_idx = 1,
-                                        .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
-                                        .endpoint = 0x85,
-                                        .ep_attr = USB_ENDPOINT_SYNC_SYNC,
-                                        .maxpacksize = 0x128,
-                                        .rates = SNDRV_PCM_RATE_48000,
-                                        .rate_min = 48000,
-                                        .rate_max = 48000,
-                                        .nr_rates = 1,
-                                        .rate_table = (unsigned int[]) {
-                                                48000
-                                        }
-                                }
-                        },
-                        {
-                                .ifnum = 5,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 6,
-                                .type = QUIRK_MIDI_MIDIMAN,
-                                .data = &(const struct snd_usb_midi_endpoint_info) {
-                                        .out_ep =  0x02,
-                                        .out_cables = 0x0001,
-                                        .in_ep = 0x81,
-                                        .in_interval = 0x01,
-                                        .in_cables = 0x0001
-                                }
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
-{
-        /* Tascam US122 MKII - playback-only support */
-        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
-        .idVendor = 0x0644,
-        .idProduct = 0x8021,
-        .bInterfaceClass = USB_CLASS_AUDIO,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "TASCAM",
-                .product_name = "US122 MKII",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = (const struct snd_usb_audio_quirk[]) {
-                        {
-                                .ifnum = 0,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-                                        .channels = 2,
-                                        .iface = 1,
-                                        .altsetting = 1,
-                                        .altset_idx = 1,
-                                        .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
-                                        .endpoint = 0x02,
-                                        .ep_attr = USB_ENDPOINT_XFER_ISOC,
-                                        .rates = SNDRV_PCM_RATE_44100 |
-                                                 SNDRV_PCM_RATE_48000 |
-                                                 SNDRV_PCM_RATE_88200 |
-                                                 SNDRV_PCM_RATE_96000,
-                                        .rate_min = 44100,
-                                        .rate_max = 96000,
-                                        .nr_rates = 4,
-                                        .rate_table = (unsigned int[]) {
-                                                44100, 48000, 88200, 96000
-                                        }
-                                }
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
-/* Microsoft XboxLive Headset/Xbox Communicator */
-{
-        USB_DEVICE(0x045e, 0x0283),
-        .bInterfaceClass = USB_CLASS_PER_INTERFACE,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .vendor_name = "Microsoft",
-                .product_name = "XboxLive Headset/Xbox Communicator",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = &(const struct snd_usb_audio_quirk[]) {
-                        {
-                                /* playback */
-                                .ifnum = 0,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                                        .channels = 1,
-                                        .iface = 0,
-                                        .altsetting = 0,
-                                        .altset_idx = 0,
-                                        .attributes = 0,
-                                        .endpoint = 0x04,
-                                        .ep_attr = 0x05,
-                                        .rates = SNDRV_PCM_RATE_CONTINUOUS,
-                                        .rate_min = 22050,
-                                        .rate_max = 22050
-                                }
-                        },
-                        {
-                                /* capture */
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                                        .channels = 1,
-                                        .iface = 1,
-                                        .altsetting = 0,
-                                        .altset_idx = 0,
-                                        .attributes = 0,
-                                        .endpoint = 0x85,
-                                        .ep_attr = 0x05,
-                                        .rates = SNDRV_PCM_RATE_CONTINUOUS,
-                                        .rate_min = 16000,
-                                        .rate_max = 16000
-                                }
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
-/* Reloop Play */
-{
-        USB_DEVICE(0x200c, 0x100b),
-        .bInterfaceClass = USB_CLASS_PER_INTERFACE,
-        .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = &(const struct snd_usb_audio_quirk[]) {
-                        {
-                                .ifnum = 0,
-                                .type = QUIRK_AUDIO_STANDARD_MIXER,
-                        },
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_FIXED_ENDPOINT,
-                                .data = &(const struct audioformat) {
-                                        .formats = SNDRV_PCM_FMTBIT_S24_3LE,
-                                        .channels = 4,
-                                        .iface = 1,
-                                        .altsetting = 1,
-                                        .altset_idx = 1,
-                                        .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE,
-                                        .endpoint = 0x01,
-                                        .ep_attr = USB_ENDPOINT_SYNC_ADAPTIVE,
-                                        .rates = SNDRV_PCM_RATE_44100 |
-                                                 SNDRV_PCM_RATE_48000,
-                                        .rate_min = 44100,
-                                        .rate_max = 48000,
-                                        .nr_rates = 2,
-                                        .rate_table = (unsigned int[]) {
-                                                44100, 48000
-                                        }
-                                }
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
-{
-        /*
-         * Focusrite Scarlett 18i6
-         *
-         * Avoid mixer creation, which otherwise fails because some of
-         * the interface descriptor subtypes for interface 0 are
-         * unknown.  That should be fixed or worked-around but this at
-         * least allows the device to be used successfully with a DAW
-         * and an external mixer.  See comments below about other
-         * ignored interfaces.
-         */
-        USB_DEVICE(0x1235, 0x8004),
-        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
-                .vendor_name = "Focusrite",
-                .product_name = "Scarlett 18i6",
-                .ifnum = QUIRK_ANY_INTERFACE,
-                .type = QUIRK_COMPOSITE,
-                .data = & (const struct snd_usb_audio_quirk[]) {
-                        {
-                                /* InterfaceSubClass 1 (Control Device) */
-                                .ifnum = 0,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 1,
-                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                        },
-                        {
-                                .ifnum = 2,
-                                .type = QUIRK_AUDIO_STANDARD_INTERFACE
-                        },
-                        {
-                                /* InterfaceSubClass 1 (Control Device) */
-                                .ifnum = 3,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = 4,
-                                .type = QUIRK_MIDI_STANDARD_INTERFACE
-                        },
-                        {
-                                /* InterfaceSubClass 1 (Device Firmware Update) */
-                                .ifnum = 5,
-                                .type = QUIRK_IGNORE_INTERFACE
-                        },
-                        {
-                                .ifnum = -1
-                        }
-                }
-        }
-},
 {
        /*
         * Some USB MIDI devices don't have an audio control interface,
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index acc12f004c2..81e07d84258 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -34,7 +34,6 @@
 #include "endpoint.h"
 #include "pcm.h"
 #include "clock.h"
-#include "stream.h"
 /*
 * handle the quirks for the contained interfaces
@@ -107,7 +106,7 @@ static int create_standard_audio_quirk(struct snd_usb_audio *chip,
        alts = &iface->altsetting[0];
        altsd = get_iface_desc(alts);
-        err = snd_usb_parse_audio_interface(chip, altsd->bInterfaceNumber);
+        err = snd_usb_parse_audio_endpoints(chip, altsd->bInterfaceNumber);
        if (err < 0) {
                snd_printk(KERN_ERR "cannot setup if %d: error %d\n",
                           altsd->bInterfaceNumber, err);
@@ -132,27 +131,23 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip,
        unsigned *rate_table = NULL;
        fp = kmemdup(quirk->data, sizeof(*fp), GFP_KERNEL);
-        if (!fp) {
+        if (! fp) {
                snd_printk(KERN_ERR "cannot memdup\n");
                return -ENOMEM;
        }
-        if (fp->nr_rates > MAX_NR_RATES) {
-                kfree(fp);
-                return -EINVAL;
-        }
        if (fp->nr_rates > 0) {
-                rate_table = kmemdup(fp->rate_table,
+                rate_table = kmalloc(sizeof(int) * fp->nr_rates, GFP_KERNEL);
-                                     sizeof(int) * fp->nr_rates, GFP_KERNEL);
                if (!rate_table) {
                        kfree(fp);
                        return -ENOMEM;
                }
+                memcpy(rate_table, fp->rate_table, sizeof(int) * fp->nr_rates);
                fp->rate_table = rate_table;
        }
        stream = (fp->endpoint & USB_DIR_IN)
                ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
-        err = snd_usb_add_audio_stream(chip, stream, fp);
+        err = snd_usb_add_audio_endpoint(chip, stream, fp);
        if (err < 0) {
                kfree(fp);
                kfree(rate_table);
@@ -228,9 +223,10 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
        if (altsd->bNumEndpoints != 1)
                return -ENXIO;
-        fp = kmemdup(&ua_format, sizeof(*fp), GFP_KERNEL);
+        fp = kmalloc(sizeof(*fp), GFP_KERNEL);
        if (!fp)
                return -ENOMEM;
+        memcpy(fp, &ua_format, sizeof(*fp));
        fp->iface = altsd->bInterfaceNumber;
        fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
@@ -258,7 +254,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip,
        stream = (fp->endpoint & USB_DIR_IN)
                ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
-        err = snd_usb_add_audio_stream(chip, stream, fp);
+        err = snd_usb_add_audio_endpoint(chip, stream, fp);
        if (err < 0) {
                kfree(fp);
                return err;
@@ -310,7 +306,6 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
                [QUIRK_MIDI_EMAGIC] = create_any_midi_quirk,
                [QUIRK_MIDI_CME] = create_any_midi_quirk,
                [QUIRK_MIDI_AKAI] = create_any_midi_quirk,
-                [QUIRK_MIDI_FTDI] = create_any_midi_quirk,
                [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk,
                [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk,
                [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk,
@@ -343,7 +338,7 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
                snd_printdd("sending Extigy boot sequence...\n");
                /* Send message to force it to reconnect with full interface. */
                err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev,0),
-                                      0x10, 0x43, 0x0001, 0x000a, NULL, 0);
+                                      0x10, 0x43, 0x0001, 0x000a, NULL, 0, 1000);
                if (err < 0) snd_printdd("error sending boot message: %d\n", err);
                err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
                                &dev->descriptor, sizeof(dev->descriptor));
@@ -364,11 +359,11 @@ static int snd_usb_audigy2nx_boot_quirk(struct usb_device *dev)
        snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), 0x2a,
                        USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                        0, 0, &buf, 1);
+                        0, 0, &buf, 1, 1000);
        if (buf == 0) {
                snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), 0x29,
                                USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER,
-                                1, 2000, NULL, 0);
+                                1, 2000, NULL, 0, 1000);
                return -ENODEV;
        }
        return 0;
@@ -411,7 +406,7 @@ static int snd_usb_cm106_write_int_reg(struct usb_device *dev, int reg, u16 valu
        buf[3] = reg;
        return snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), USB_REQ_SET_CONFIGURATION,
                               USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_ENDPOINT,
-                               0, 0, &buf, 4);
+                               0, 0, &buf, 4, 1000);
 }
 static int snd_usb_cm106_boot_quirk(struct usb_device *dev)
@@ -497,92 +492,6 @@ static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
        return -EAGAIN;
 }
-static void mbox2_setup_48_24_magic(struct usb_device *dev)
-{
-        u8 srate[3];
-        u8 temp[12];
-        /* Choose 48000Hz permanently */
-        srate[0] = 0x80;
-        srate[1] = 0xbb;
-        srate[2] = 0x00;
-        /* Send the magic! */
-        snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0),
-                0x01, 0x22, 0x0100, 0x0085, &temp, 0x0003);
-        snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
-                0x81, 0xa2, 0x0100, 0x0085, &srate, 0x0003);
-        snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
-                0x81, 0xa2, 0x0100, 0x0086, &srate, 0x0003);
-        snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
-                0x81, 0xa2, 0x0100, 0x0003, &srate, 0x0003);
-        return;
-}
-/* Digidesign Mbox 2 needs to load firmware onboard
- * and driver must wait a few seconds for initialisation.
- */
-#define MBOX2_FIRMWARE_SIZE    646
-#define MBOX2_BOOT_LOADING     0x01 /* Hard coded into the device */
-#define MBOX2_BOOT_READY       0x02 /* Hard coded into the device */
-static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
-{
-        struct usb_host_config *config = dev->actconfig;
-        int err;
-        u8 bootresponse[12];
-        int fwsize;
-        int count;
-        fwsize = le16_to_cpu(get_cfg_desc(config)->wTotalLength);
-        if (fwsize != MBOX2_FIRMWARE_SIZE) {
-                snd_printk(KERN_ERR "usb-audio: Invalid firmware size=%d.\n", fwsize);
-                return -ENODEV;
-        }
-        snd_printd("usb-audio: Sending Digidesign Mbox 2 boot sequence...\n");
-        count = 0;
-        bootresponse[0] = MBOX2_BOOT_LOADING;
-        while ((bootresponse[0] == MBOX2_BOOT_LOADING) && (count < 10)) {
-                msleep(500); /* 0.5 second delay */
-                snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0),
-                        /* Control magic - load onboard firmware */
-                        0x85, 0xc0, 0x0001, 0x0000, &bootresponse, 0x0012);
-                if (bootresponse[0] == MBOX2_BOOT_READY)
-                        break;
-                snd_printd("usb-audio: device not ready, resending boot sequence...\n");
-                count++;
-        }
-        if (bootresponse[0] != MBOX2_BOOT_READY) {
-                snd_printk(KERN_ERR "usb-audio: Unknown bootresponse=%d, or timed out, ignoring device.\n", bootresponse[0]);
-                return -ENODEV;
-        }
-        snd_printdd("usb-audio: device initialised!\n");
-        err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
-                &dev->descriptor, sizeof(dev->descriptor));
-        config = dev->actconfig;
-        if (err < 0)
-                snd_printd("error usb_get_descriptor: %d\n", err);
-        err = usb_reset_configuration(dev);
-        if (err < 0)
-                snd_printd("error usb_reset_configuration: %d\n", err);
-        snd_printdd("mbox2_boot: new boot length = %d\n",
-                le16_to_cpu(get_cfg_desc(config)->wTotalLength));
-        mbox2_setup_48_24_magic(dev);
-        snd_printk(KERN_INFO "usb-audio: Digidesign Mbox 2: 24bit 48kHz");
-        return 0; /* Successful boot */
-}
 /*
 * Setup quirks
 */
@@ -659,6 +568,7 @@ static int audiophile_skip_setting_quirk(struct snd_usb_audio *chip,
        return 0; /* keep this altsetting */
 }
 static int fasttrackpro_skip_setting_quirk(struct snd_usb_audio *chip,
                                           int iface, int altno)
 {
@@ -740,10 +650,6 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
        case USB_ID(0x0ccd, 0x00b1): /* Terratec Aureon 7.1 USB */
                return snd_usb_cm6206_boot_quirk(dev);
-        case USB_ID(0x0dba, 0x3000):
-                /* Digidesign Mbox 2 */
-                return snd_usb_mbox2_boot_quirk(dev);
        case USB_ID(0x133e, 0x0815):
                /* Access Music VirusTI Desktop */
                return snd_usb_accessmusic_boot_quirk(dev);
@@ -764,7 +670,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev,
 */
 int snd_usb_is_big_endian_format(struct snd_usb_audio *chip, struct audioformat *fp)
 {
-        /* it depends on altsetting whether the device is big-endian or not */
+        /* it depends on altsetting wether the device is big-endian or not */
        switch (chip->usb_id) {
        case USB_ID(0x0763, 0x2001): /* M-Audio Quattro: captured data only */
                if (fp->altsetting == 2 || fp->altsetting == 3 ||
@@ -850,27 +756,3 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
        }
 }
-void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep)
-{
-        /*
-         * "Playback Design" products send bogus feedback data at the start
-         * of the stream. Ignore them.
-         */
-        if ((le16_to_cpu(ep->chip->dev->descriptor.idVendor) == 0x23ba) &&
-            ep->type == SND_USB_ENDPOINT_TYPE_SYNC)
-                ep->skip_packets = 4;
-}
-void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
-                           __u8 request, __u8 requesttype, __u16 value,
-                           __u16 index, void *data, __u16 size)
-{
-        /*
-         * "Playback Design" products need a 20ms delay after each
-         * class compliant request
-         */
-        if ((le16_to_cpu(dev->descriptor.idVendor) == 0x23ba) &&
-            (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS)
-                mdelay(20);
-}
diff --git a/sound/usb/quirks.h b/sound/usb/quirks.h
index 0ca9e91067a..03e5e94098c 100644
--- a/sound/usb/quirks.h
+++ b/sound/usb/quirks.h
@@ -1,10 +1,6 @@
 #ifndef __USBAUDIO_QUIRKS_H
 #define __USBAUDIO_QUIRKS_H
-struct audioformat;
-struct snd_usb_endpoint;
-struct snd_usb_substream;
 int snd_usb_create_quirk(struct snd_usb_audio *chip,
                         struct usb_interface *iface,
                         struct usb_driver *driver,
@@ -24,10 +20,4 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs,
 int snd_usb_is_big_endian_format(struct snd_usb_audio *chip,
                                 struct audioformat *fp);
-void snd_usb_endpoint_start_quirk(struct snd_usb_endpoint *ep);
-void snd_usb_ctl_msg_quirk(struct usb_device *dev, unsigned int pipe,
-                           __u8 request, __u8 requesttype, __u16 value,
-                           __u16 index, void *data, __u16 size);
 #endif /* __USBAUDIO_QUIRKS_H */
diff --git a/sound/usb/stream.c b/sound/usb/stream.c
deleted file mode 100644
index ad181d538bd..00000000000
--- a/sound/usb/stream.c
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- */
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/usb.h>
-#include <linux/usb/audio.h>
-#include <linux/usb/audio-v2.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/control.h>
-#include <sound/tlv.h>
-#include "usbaudio.h"
-#include "card.h"
-#include "proc.h"
-#include "quirks.h"
-#include "endpoint.h"
-#include "pcm.h"
-#include "helper.h"
-#include "format.h"
-#include "clock.h"
-#include "stream.h"
-/*
- * free a substream
- */
-static void free_substream(struct snd_usb_substream *subs)
-{
-        struct list_head *p, *n;
-        if (!subs->num_formats)
-                return; /* not initialized */
-        list_for_each_safe(p, n, &subs->fmt_list) {
-                struct audioformat *fp = list_entry(p, struct audioformat, list);
-                kfree(fp->rate_table);
-                kfree(fp->chmap);
-                kfree(fp);
-        }
-        kfree(subs->rate_list.list);
-}
-/*
- * free a usb stream instance
- */
-static void snd_usb_audio_stream_free(struct snd_usb_stream *stream)
-{
-        free_substream(&stream->substream[0]);
-        free_substream(&stream->substream[1]);
-        list_del(&stream->list);
-        kfree(stream);
-}
-static void snd_usb_audio_pcm_free(struct snd_pcm *pcm)
-{
-        struct snd_usb_stream *stream = pcm->private_data;
-        if (stream) {
-                stream->pcm = NULL;
-                snd_usb_audio_stream_free(stream);
-        }
-}
-/*
- * initialize the substream instance.
- */
-static void snd_usb_init_substream(struct snd_usb_stream *as,
-                                   int stream,
-                                   struct audioformat *fp)
-{
-        struct snd_usb_substream *subs = &as->substream[stream];
-        INIT_LIST_HEAD(&subs->fmt_list);
-        spin_lock_init(&subs->lock);
-        subs->stream = as;
-        subs->direction = stream;
-        subs->dev = as->chip->dev;
-        subs->txfr_quirk = as->chip->txfr_quirk;
-        subs->speed = snd_usb_get_speed(subs->dev);
-        snd_usb_set_pcm_ops(as->pcm, stream);
-        list_add_tail(&fp->list, &subs->fmt_list);
-        subs->formats |= fp->formats;
-        subs->num_formats++;
-        subs->fmt_type = fp->fmt_type;
-        subs->ep_num = fp->endpoint;
-        if (fp->channels > subs->channels_max)
-                subs->channels_max = fp->channels;
-}
-/* kctl callbacks for usb-audio channel maps */
-static int usb_chmap_ctl_info(struct snd_kcontrol *kcontrol,
-                              struct snd_ctl_elem_info *uinfo)
-{
-        struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
-        struct snd_usb_substream *subs = info->private_data;
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-        uinfo->count = subs->channels_max;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = SNDRV_CHMAP_LAST;
-        return 0;
-}
-/* check whether a duplicated entry exists in the audiofmt list */
-static bool have_dup_chmap(struct snd_usb_substream *subs,
-                           struct audioformat *fp)
-{
-        struct list_head *p;
-        for (p = fp->list.prev; p != &subs->fmt_list; p = p->prev) {
-                struct audioformat *prev;
-                prev = list_entry(p, struct audioformat, list);
-                if (prev->chmap &&
-                    !memcmp(prev->chmap, fp->chmap, sizeof(*fp->chmap)))
-                        return true;
-        }
-        return false;
-}
-static int usb_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
-                             unsigned int size, unsigned int __user *tlv)
-{
-        struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
-        struct snd_usb_substream *subs = info->private_data;
-        struct audioformat *fp;
-        unsigned int __user *dst;
-        int count = 0;
-        if (size < 8)
-                return -ENOMEM;
-        if (put_user(SNDRV_CTL_TLVT_CONTAINER, tlv))
-                return -EFAULT;
-        size -= 8;
-        dst = tlv + 2;
-        list_for_each_entry(fp, &subs->fmt_list, list) {
-                int i, ch_bytes;
-                if (!fp->chmap)
-                        continue;
-                if (have_dup_chmap(subs, fp))
-                        continue;
-                /* copy the entry */
-                ch_bytes = fp->chmap->channels * 4;
-                if (size < 8 + ch_bytes)
-                        return -ENOMEM;
-                if (put_user(SNDRV_CTL_TLVT_CHMAP_FIXED, dst) ||
-                    put_user(ch_bytes, dst + 1))
-                        return -EFAULT;
-                dst += 2;
-                for (i = 0; i < fp->chmap->channels; i++, dst++) {
-                        if (put_user(fp->chmap->map[i], dst))
-                                return -EFAULT;
-                }
-                count += 8 + ch_bytes;
-                size -= 8 + ch_bytes;
-        }
-        if (put_user(count, tlv + 1))
-                return -EFAULT;
-        return 0;
-}
-static int usb_chmap_ctl_get(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
-{
-        struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
-        struct snd_usb_substream *subs = info->private_data;
-        struct snd_pcm_chmap_elem *chmap = NULL;
-        int i;
-        memset(ucontrol->value.integer.value, 0,
-               sizeof(ucontrol->value.integer.value));
-        if (subs->cur_audiofmt)
-                chmap = subs->cur_audiofmt->chmap;
-        if (chmap) {
-                for (i = 0; i < chmap->channels; i++)
-                        ucontrol->value.integer.value[i] = chmap->map[i];
-        }
-        return 0;
-}
-/* create a chmap kctl assigned to the given USB substream */
-static int add_chmap(struct snd_pcm *pcm, int stream,
-                     struct snd_usb_substream *subs)
-{
-        struct audioformat *fp;
-        struct snd_pcm_chmap *chmap;
-        struct snd_kcontrol *kctl;
-        int err;
-        list_for_each_entry(fp, &subs->fmt_list, list)
-                if (fp->chmap)
-                        goto ok;
-        /* no chmap is found */
-        return 0;
- ok:
-        err = snd_pcm_add_chmap_ctls(pcm, stream, NULL, 0, 0, &chmap);
-        if (err < 0)
-                return err;
-        /* override handlers */
-        chmap->private_data = subs;
-        kctl = chmap->kctl;
-        kctl->info = usb_chmap_ctl_info;
-        kctl->get = usb_chmap_ctl_get;
-        kctl->tlv.c = usb_chmap_ctl_tlv;
-        return 0;
-}
-/* convert from USB ChannelConfig bits to ALSA chmap element */
-static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
-                                                int protocol)
-{
-        static unsigned int uac1_maps[] = {
-                SNDRV_CHMAP_FL,         /* left front */
-                SNDRV_CHMAP_FR,         /* right front */
-                SNDRV_CHMAP_FC,         /* center front */
-                SNDRV_CHMAP_LFE,        /* LFE */
-                SNDRV_CHMAP_SL,         /* left surround */
-                SNDRV_CHMAP_SR,         /* right surround */
-                SNDRV_CHMAP_FLC,        /* left of center */
-                SNDRV_CHMAP_FRC,        /* right of center */
-                SNDRV_CHMAP_RC,         /* surround */
-                SNDRV_CHMAP_SL,         /* side left */
-                SNDRV_CHMAP_SR,         /* side right */
-                SNDRV_CHMAP_TC,         /* top */
-                0 /* terminator */
-        };
-        static unsigned int uac2_maps[] = {
-                SNDRV_CHMAP_FL,         /* front left */
-                SNDRV_CHMAP_FR,         /* front right */
-                SNDRV_CHMAP_FC,         /* front center */
-                SNDRV_CHMAP_LFE,        /* LFE */
-                SNDRV_CHMAP_RL,         /* back left */
-                SNDRV_CHMAP_RR,         /* back right */
-                SNDRV_CHMAP_FLC,        /* front left of center */
-                SNDRV_CHMAP_FRC,        /* front right of center */
-                SNDRV_CHMAP_RC,         /* back center */
-                SNDRV_CHMAP_SL,         /* side left */
-                SNDRV_CHMAP_SR,         /* side right */
-                SNDRV_CHMAP_TC,         /* top center */
-                SNDRV_CHMAP_TFL,        /* top front left */
-                SNDRV_CHMAP_TFC,        /* top front center */
-                SNDRV_CHMAP_TFR,        /* top front right */
-                SNDRV_CHMAP_TRL,        /* top back left */
-                SNDRV_CHMAP_TRC,        /* top back center */
-                SNDRV_CHMAP_TRR,        /* top back right */
-                SNDRV_CHMAP_TFLC,       /* top front left of center */
-                SNDRV_CHMAP_TFRC,       /* top front right of center */
-                SNDRV_CHMAP_LLFE,       /* left LFE */
-                SNDRV_CHMAP_RLFE,       /* right LFE */
-                SNDRV_CHMAP_TSL,        /* top side left */
-                SNDRV_CHMAP_TSR,        /* top side right */
-                SNDRV_CHMAP_BC,         /* bottom center */
-                SNDRV_CHMAP_BLC,        /* bottom left center */
-                SNDRV_CHMAP_BRC,        /* bottom right center */
-                0 /* terminator */
-        };
-        struct snd_pcm_chmap_elem *chmap;
-        const unsigned int *maps;
-        int c;
-        if (!bits)
-                return NULL;
-        if (channels > ARRAY_SIZE(chmap->map))
-                return NULL;
-        chmap = kzalloc(sizeof(*chmap), GFP_KERNEL);
-        if (!chmap)
-                return NULL;
-        maps = protocol == UAC_VERSION_2 ? uac2_maps : uac1_maps;
-        chmap->channels = channels;
-        c = 0;
-        for (; bits && *maps; maps++, bits >>= 1) {
-                if (bits & 1)
-                        chmap->map[c++] = *maps;
-        }
-        for (; c < channels; c++)
-                chmap->map[c] = SNDRV_CHMAP_UNKNOWN;
-        return chmap;
-}
-/*
- * add this endpoint to the chip instance.
- * if a stream with the same endpoint already exists, append to it.
- * if not, create a new pcm stream.
- */
-int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
-                             int stream,
-                             struct audioformat *fp)
-{
-        struct list_head *p;
-        struct snd_usb_stream *as;
-        struct snd_usb_substream *subs;
-        struct snd_pcm *pcm;
-        int err;
-        list_for_each(p, &chip->pcm_list) {
-                as = list_entry(p, struct snd_usb_stream, list);
-                if (as->fmt_type != fp->fmt_type)
-                        continue;
-                subs = &as->substream[stream];
-                if (subs->ep_num == fp->endpoint) {
-                        list_add_tail(&fp->list, &subs->fmt_list);
-                        subs->num_formats++;
-                        subs->formats |= fp->formats;
-                        return 0;
-                }
-        }
-        /* look for an empty stream */
-        list_for_each(p, &chip->pcm_list) {
-                as = list_entry(p, struct snd_usb_stream, list);
-                if (as->fmt_type != fp->fmt_type)
-                        continue;
-                subs = &as->substream[stream];
-                if (subs->ep_num)
-                        continue;
-                err = snd_pcm_new_stream(as->pcm, stream, 1);
-                if (err < 0)
-                        return err;
-                snd_usb_init_substream(as, stream, fp);
-                return add_chmap(as->pcm, stream, subs);
-        }
-        /* create a new pcm */
-        as = kzalloc(sizeof(*as), GFP_KERNEL);
-        if (!as)
-                return -ENOMEM;
-        as->pcm_index = chip->pcm_devs;
-        as->chip = chip;
-        as->fmt_type = fp->fmt_type;
-        err = snd_pcm_new(chip->card, "USB Audio", chip->pcm_devs,
-                          stream == SNDRV_PCM_STREAM_PLAYBACK ? 1 : 0,
-                          stream == SNDRV_PCM_STREAM_PLAYBACK ? 0 : 1,
-                          &pcm);
-        if (err < 0) {
-                kfree(as);
-                return err;
-        }
-        as->pcm = pcm;
-        pcm->private_data = as;
-        pcm->private_free = snd_usb_audio_pcm_free;
-        pcm->info_flags = 0;
-        if (chip->pcm_devs > 0)
-                sprintf(pcm->name, "USB Audio #%d", chip->pcm_devs);
-        else
-                strcpy(pcm->name, "USB Audio");
-        snd_usb_init_substream(as, stream, fp);
-        list_add(&as->list, &chip->pcm_list);
-        chip->pcm_devs++;
-        snd_usb_proc_pcm_format_add(as);
-        return add_chmap(pcm, stream, &as->substream[stream]);
-}
-static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip,
-                                         struct usb_host_interface *alts,
-                                         int protocol, int iface_no)
-{
-        /* parsed with a v1 header here. that's ok as we only look at the
-         * header first which is the same for both versions */
-        struct uac_iso_endpoint_descriptor *csep;
-        struct usb_interface_descriptor *altsd = get_iface_desc(alts);
-        int attributes = 0;
-        csep = snd_usb_find_desc(alts->endpoint[0].extra, alts->endpoint[0].extralen, NULL, USB_DT_CS_ENDPOINT);
-        /* Creamware Noah has this descriptor after the 2nd endpoint */
-        if (!csep && altsd->bNumEndpoints >= 2)
-                csep = snd_usb_find_desc(alts->endpoint[1].extra, alts->endpoint[1].extralen, NULL, USB_DT_CS_ENDPOINT);
-        if (!csep || csep->bLength < 7 ||
-            csep->bDescriptorSubtype != UAC_EP_GENERAL) {
-                snd_printk(KERN_WARNING "%d:%u:%d : no or invalid"
-                           " class specific endpoint descriptor\n",
-                           chip->dev->devnum, iface_no,
-                           altsd->bAlternateSetting);
-                return 0;
-        }
-        if (protocol == UAC_VERSION_1) {
-                attributes = csep->bmAttributes;
-        } else {
-                struct uac2_iso_endpoint_descriptor *csep2 =
-                        (struct uac2_iso_endpoint_descriptor *) csep;
-                attributes = csep->bmAttributes & UAC_EP_CS_ATTR_FILL_MAX;
-                /* emulate the endpoint attributes of a v1 device */
-                if (csep2->bmControls & UAC2_CONTROL_PITCH)
-                        attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL;
-        }
-        return attributes;
-}
-/* find an input terminal descriptor (either UAC1 or UAC2) with the given
- * terminal id
- */
-static void *
-snd_usb_find_input_terminal_descriptor(struct usb_host_interface *ctrl_iface,
-                                               int terminal_id)
-{
-        struct uac2_input_terminal_descriptor *term = NULL;
-        while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
-                                               ctrl_iface->extralen,
-                                               term, UAC_INPUT_TERMINAL))) {
-                if (term->bTerminalID == terminal_id)
-                        return term;
-        }
-        return NULL;
-}
-static struct uac2_output_terminal_descriptor *
-        snd_usb_find_output_terminal_descriptor(struct usb_host_interface *ctrl_iface,
-                                                int terminal_id)
-{
-        struct uac2_output_terminal_descriptor *term = NULL;
-        while ((term = snd_usb_find_csint_desc(ctrl_iface->extra,
-                                               ctrl_iface->extralen,
-                                               term, UAC_OUTPUT_TERMINAL))) {
-                if (term->bTerminalID == terminal_id)
-                        return term;
-        }
-        return NULL;
-}
-int snd_usb_parse_audio_interface(struct snd_usb_audio *chip, int iface_no)
-{
-        struct usb_device *dev;
-        struct usb_interface *iface;
-        struct usb_host_interface *alts;
-        struct usb_interface_descriptor *altsd;
-        int i, altno, err, stream;
-        int format = 0, num_channels = 0;
-        struct audioformat *fp = NULL;
-        int num, protocol, clock = 0;
-        struct uac_format_type_i_continuous_descriptor *fmt;
-        unsigned int chconfig;
-        dev = chip->dev;
-        /* parse the interface's altsettings */
-        iface = usb_ifnum_to_if(dev, iface_no);
-        num = iface->num_altsetting;
-        /*
-         * Dallas DS4201 workaround: It presents 5 altsettings, but the last
-         * one misses syncpipe, and does not produce any sound.
-         */
-        if (chip->usb_id == USB_ID(0x04fa, 0x4201))
-                num = 4;
-        for (i = 0; i < num; i++) {
-                alts = &iface->altsetting[i];
-                altsd = get_iface_desc(alts);
-                protocol = altsd->bInterfaceProtocol;
-                /* skip invalid one */
-                if ((altsd->bInterfaceClass != USB_CLASS_AUDIO &&
-                     altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC) ||
-                    (altsd->bInterfaceSubClass != USB_SUBCLASS_AUDIOSTREAMING &&
-                     altsd->bInterfaceSubClass != USB_SUBCLASS_VENDOR_SPEC) ||
-                    altsd->bNumEndpoints < 1 ||
-                    le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) == 0)
-                        continue;
-                /* must be isochronous */
-                if ((get_endpoint(alts, 0)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
-                    USB_ENDPOINT_XFER_ISOC)
-                        continue;
-                /* check direction */
-                stream = (get_endpoint(alts, 0)->bEndpointAddress & USB_DIR_IN) ?
-                        SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
-                altno = altsd->bAlternateSetting;
-                if (snd_usb_apply_interface_quirk(chip, iface_no, altno))
-                        continue;
-                chconfig = 0;
-                /* get audio formats */
-                switch (protocol) {
-                default:
-                        snd_printdd(KERN_WARNING "%d:%u:%d: unknown interface protocol %#02x, assuming v1\n",
-                                    dev->devnum, iface_no, altno, protocol);
-                        protocol = UAC_VERSION_1;
-                        /* fall through */
-                case UAC_VERSION_1: {
-                        struct uac1_as_header_descriptor *as =
-                                snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
-                        struct uac_input_terminal_descriptor *iterm;
-                        if (!as) {
-                                snd_printk(KERN_ERR "%d:%u:%d : UAC_AS_GENERAL descriptor not found\n",
-                                           dev->devnum, iface_no, altno);
-                                continue;
-                        }
-                        if (as->bLength < sizeof(*as)) {
-                                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_AS_GENERAL desc\n",
-                                           dev->devnum, iface_no, altno);
-                                continue;
-                        }
-                        format = le16_to_cpu(as->wFormatTag); /* remember the format value */
-                        iterm = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
-                                                                       as->bTerminalLink);
-                        if (iterm) {
-                                num_channels = iterm->bNrChannels;
-                                chconfig = le16_to_cpu(iterm->wChannelConfig);
-                        }
-                        break;
-                }
-                case UAC_VERSION_2: {
-                        struct uac2_input_terminal_descriptor *input_term;
-                        struct uac2_output_terminal_descriptor *output_term;
-                        struct uac2_as_header_descriptor *as =
-                                snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_AS_GENERAL);
-                        if (!as) {
-                                snd_printk(KERN_ERR "%d:%u:%d : UAC_AS_GENERAL descriptor not found\n",
-                                           dev->devnum, iface_no, altno);
-                                continue;
-                        }
-                        if (as->bLength < sizeof(*as)) {
-                                snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_AS_GENERAL desc\n",
-                                           dev->devnum, iface_no, altno);
-                                continue;
-                        }
-                        num_channels = as->bNrChannels;
-                        format = le32_to_cpu(as->bmFormats);
-                        /* lookup the terminal associated to this interface
-                         * to extract the clock */
-                        input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf,
-                                                                            as->bTerminalLink);
-                        if (input_term) {
-                                clock = input_term->bCSourceID;
-                                chconfig = le32_to_cpu(input_term->bmChannelConfig);
-                                break;
-                        }
-                        output_term = snd_usb_find_output_terminal_descriptor(chip->ctrl_intf,
-                                                                              as->bTerminalLink);
-                        if (output_term) {
-                                clock = output_term->bCSourceID;
-                                break;
-                        }
-                        snd_printk(KERN_ERR "%d:%u:%d : bogus bTerminalLink %d\n",
-                                   dev->devnum, iface_no, altno, as->bTerminalLink);
-                        continue;
-                }
-                }
-                /* get format type */
-                fmt = snd_usb_find_csint_desc(alts->extra, alts->extralen, NULL, UAC_FORMAT_TYPE);
-                if (!fmt) {
-                        snd_printk(KERN_ERR "%d:%u:%d : no UAC_FORMAT_TYPE desc\n",
-                                   dev->devnum, iface_no, altno);
-                        continue;
-                }
-                if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) ||
-                    ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) {
-                        snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
-                                   dev->devnum, iface_no, altno);
-                        continue;
-                }
-                /*
-                 * Blue Microphones workaround: The last altsetting is identical
-                 * with the previous one, except for a larger packet size, but
-                 * is actually a mislabeled two-channel setting; ignore it.
-                 */
-                if (fmt->bNrChannels == 1 &&
-                    fmt->bSubframeSize == 2 &&
-                    altno == 2 && num == 3 &&
-                    fp && fp->altsetting == 1 && fp->channels == 1 &&
-                    fp->formats == SNDRV_PCM_FMTBIT_S16_LE &&
-                    protocol == UAC_VERSION_1 &&
-                    le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize) ==
-                                                        fp->maxpacksize * 2)
-                        continue;
-                fp = kzalloc(sizeof(*fp), GFP_KERNEL);
-                if (! fp) {
-                        snd_printk(KERN_ERR "cannot malloc\n");
-                        return -ENOMEM;
-                }
-                fp->iface = iface_no;
-                fp->altsetting = altno;
-                fp->altset_idx = i;
-                fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
-                fp->ep_attr = get_endpoint(alts, 0)->bmAttributes;
-                fp->datainterval = snd_usb_parse_datainterval(chip, alts);
-                fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize);
-                fp->channels = num_channels;
-                if (snd_usb_get_speed(dev) == USB_SPEED_HIGH)
-                        fp->maxpacksize = (((fp->maxpacksize >> 11) & 3) + 1)
-                                        * (fp->maxpacksize & 0x7ff);
-                fp->attributes = parse_uac_endpoint_attributes(chip, alts, protocol, iface_no);
-                fp->clock = clock;
-                fp->chmap = convert_chmap(num_channels, chconfig, protocol);
-                /* some quirks for attributes here */
-                switch (chip->usb_id) {
-                case USB_ID(0x0a92, 0x0053): /* AudioTrak Optoplay */
-                        /* Optoplay sets the sample rate attribute although
-                         * it seems not supporting it in fact.
-                         */
-                        fp->attributes &= ~UAC_EP_CS_ATTR_SAMPLE_RATE;
-                        break;
-                case USB_ID(0x041e, 0x3020): /* Creative SB Audigy 2 NX */
-                case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */
-                        /* doesn't set the sample rate attribute, but supports it */
-                        fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
-                        break;
-                case USB_ID(0x0763, 0x2001):  /* M-Audio Quattro USB */
-                case USB_ID(0x0763, 0x2012):  /* M-Audio Fast Track Pro USB */
-                case USB_ID(0x047f, 0x0ca1): /* plantronics headset */
-                case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is
-                                                an older model 77d:223) */
-                /*
-                 * plantronics headset and Griffin iMic have set adaptive-in
-                 * although it's really not...
-                 */
-                        fp->ep_attr &= ~USB_ENDPOINT_SYNCTYPE;
-                        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-                                fp->ep_attr |= USB_ENDPOINT_SYNC_ADAPTIVE;
-                        else
-                                fp->ep_attr |= USB_ENDPOINT_SYNC_SYNC;
-                        break;
-                }
-                /* ok, let's parse further... */
-                if (snd_usb_parse_audio_format(chip, fp, format, fmt, stream, alts) < 0) {
-                        kfree(fp->rate_table);
-                        kfree(fp->chmap);
-                        kfree(fp);
-                        fp = NULL;
-                        continue;
-                }
-                snd_printdd(KERN_INFO "%d:%u:%d: add audio endpoint %#x\n", dev->devnum, iface_no, altno, fp->endpoint);
-                err = snd_usb_add_audio_stream(chip, stream, fp);
-                if (err < 0) {
-                        kfree(fp->rate_table);
-                        kfree(fp->chmap);
-                        kfree(fp);
-                        return err;
-                }
-                /* try to set the interface... */
-                usb_set_interface(chip->dev, iface_no, altno);
-                snd_usb_init_pitch(chip, iface_no, alts, fp);
-                snd_usb_init_sample_rate(chip, iface_no, alts, fp, fp->rate_max);
-        }
-        return 0;
-}
diff --git a/sound/usb/stream.h b/sound/usb/stream.h
deleted file mode 100644
index c97f679fc84..00000000000
--- a/sound/usb/stream.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __USBAUDIO_STREAM_H
-#define __USBAUDIO_STREAM_H
-int snd_usb_parse_audio_interface(struct snd_usb_audio *chip,
-                                  int iface_no);
-int snd_usb_add_audio_stream(struct snd_usb_audio *chip,
-                             int stream,
-                             struct audioformat *fp);
-#endif /* __USBAUDIO_STREAM_H */
diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 1ac3fd9cc5a..1e79986b577 100644
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -36,8 +36,7 @@ struct snd_usb_audio {
        struct snd_card *card;
        struct usb_interface *pm_intf;
        u32 usb_id;
-        struct mutex mutex;
+        struct mutex shutdown_mutex;
-        struct rw_semaphore shutdown_rwsem;
        unsigned int shutdown:1;
        unsigned int probing:1;
        unsigned int autosuspended:1;   
@@ -47,7 +46,6 @@ struct snd_usb_audio {
        int num_suspended_intf;
        struct list_head pcm_list;      /* list of pcm streams */
-        struct list_head ep_list;       /* list of audio-related endpoints */
        int pcm_devs;
        struct list_head midi_list;     /* list of midi interfaces */
@@ -56,6 +54,7 @@ struct snd_usb_audio {
        int setup;                      /* from the 'device_setup' module param */
        int nrpacks;                    /* from the 'nrpacks' module param */
+        int async_unlink;               /* from the 'async_unlink' module param */
        struct usb_host_interface *ctrl_intf;   /* the audio control interface */
 };
@@ -81,7 +80,6 @@ enum quirk_type {
        QUIRK_MIDI_CME,
        QUIRK_MIDI_AKAI,
        QUIRK_MIDI_US122L,
-        QUIRK_MIDI_FTDI,
        QUIRK_AUDIO_STANDARD_INTERFACE,
        QUIRK_AUDIO_FIXED_ENDPOINT,
        QUIRK_AUDIO_EDIROL_UAXX,
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index d0323a693ba..084e6fc8d5b 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
-#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/hwdep.h>
 #include <sound/pcm.h>
@@ -37,7 +36,7 @@ MODULE_LICENSE("GPL");
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-max */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* Id for this card */
                                                        /* Enable this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for "NAME_ALLCAPS".");
@@ -262,7 +261,7 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw,
        }
        area->vm_ops = &usb_stream_hwdep_vm_ops;
-        area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+        area->vm_flags |= VM_RESERVED;
        area->vm_private_data = us122l;
        atomic_inc(&us122l->mmap_count);
 out:
@@ -772,4 +771,16 @@ static struct usb_driver snd_us122l_usb_driver = {
        .supports_autosuspend = 1
 };
-module_usb_driver(snd_us122l_usb_driver);
+static int __init snd_us122l_module_init(void)
+{
+        return usb_register(&snd_us122l_usb_driver);
+}
+static void __exit snd_us122l_module_exit(void)
+{
+        usb_deregister(&snd_us122l_usb_driver);
+}
+module_init(snd_us122l_module_init)
+module_exit(snd_us122l_module_exit)
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index 0b34dbc8f30..04aafb43a13 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -82,7 +82,7 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v
                us428->us428ctls_sharedmem->CtlSnapShotLast = -2;
        }
        area->vm_ops = &us428ctls_vm_ops;
-        area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+        area->vm_flags |= VM_RESERVED | VM_DONTEXPAND;
        area->vm_private_data = hw->private_data;
        return 0;
 }
diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 9af7c1f1741..cbd37f2c76d 100644
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -154,7 +154,7 @@ MODULE_SUPPORTED_DEVICE("{{TASCAM(0x1604), "NAME_ALLCAPS"(0x8001)(0x8005)(0x8007
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-max */
 static char* id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* Id for this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for "NAME_ALLCAPS".");
@@ -459,4 +459,15 @@ static void usX2Y_usb_disconnect(struct usb_device *device, void* ptr)
        }
 }
-module_usb_driver(snd_usX2Y_usb_driver);
+static int __init snd_usX2Y_module_init(void)
+{
+        return usb_register(&snd_usX2Y_usb_driver);
+}
+static void __exit snd_usX2Y_module_exit(void)
+{
+        usb_deregister(&snd_usX2Y_usb_driver);
+}
+module_init(snd_usX2Y_module_init)
+module_exit(snd_usX2Y_module_exit)
diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c
index 520ef96d7c7..5d37d1ccf81 100644
--- a/sound/usb/usx2y/usbusx2yaudio.c
+++ b/sound/usb/usx2y/usbusx2yaudio.c
@@ -34,7 +34,6 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
-#include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/info.h>
 #include <sound/pcm.h>
@@ -80,7 +79,7 @@ static int usX2Y_urb_capt_retire(struct snd_usX2Y_substream *subs)
                cp = (unsigned char*)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
                if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */
                        snd_printk(KERN_ERR "active frame status %i. "
-                                   "Most probably some hardware problem.\n",
+                                   "Most propably some hardware problem.\n",
                                   urb->iso_frame_desc[i].status);
                        return urb->iso_frame_desc[i].status;
                }
@@ -300,7 +299,7 @@ static void usX2Y_error_sequence(struct usX2Ydev *usX2Y,
 {
        snd_printk(KERN_ERR
 "Sequence Error!(hcd_frame=%i ep=%i%s;wait=%i,frame=%i).\n"
-"Most probably some urb of usb-frame %i is still missing.\n"
+"Most propably some urb of usb-frame %i is still missing.\n"
 "Cause could be too long delays in usb-hcd interrupt handling.\n",
                   usb_get_current_frame_number(usX2Y->dev),
                   subs->endpoint, usb_pipein(urb->pipe) ? "in" : "out",
diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c
index cc56007791e..a51340f6f2d 100644
--- a/sound/usb/usx2y/usx2yhwdeppcm.c
+++ b/sound/usb/usx2y/usx2yhwdeppcm.c
@@ -74,7 +74,7 @@ static int usX2Y_usbpcm_urb_capt_retire(struct snd_usX2Y_substream *subs)
        }
        for (i = 0; i < nr_of_packs(); i++) {
                if (urb->iso_frame_desc[i].status) { /* active? hmm, skip this */
-                        snd_printk(KERN_ERR "active frame status %i. Most probably some hardware problem.\n", urb->iso_frame_desc[i].status);
+                        snd_printk(KERN_ERR "activ frame status %i. Most propably some hardware problem.\n", urb->iso_frame_desc[i].status);
                        return urb->iso_frame_desc[i].status;
                }
                lens += urb->iso_frame_desc[i].actual_length / usX2Y->stride;
@@ -723,7 +723,7 @@ static int snd_usX2Y_hwdep_pcm_mmap(struct snd_hwdep * hw, struct file *filp, st
                return -ENODEV;
        }
        area->vm_ops = &snd_usX2Y_hwdep_pcm_vm_ops;
-        area->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+        area->vm_flags |= VM_RESERVED | VM_DONTEXPAND;
        area->vm_private_data = hw->private_data;
        return 0;
 }
author	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
committer	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
commit	8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree	a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /sound/usb
parent	406089d01562f1e2bf9f089fd7637009ebaad589 (diff)