9 files changed, 207 insertions, 46 deletions

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 315360f31278..706143826aff 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -40,6 +40,7 @@ config SND_USB_CAIAQ
            namely:
 
             * Native Instruments RigKontrol2
+            * Native Instruments RigKontrol3
             * Native Instruments Kore Controller
             * Native Instruments Audio Kontrol 1
             * Native Instruments Audio 8 DJ
@@ -55,6 +56,7 @@ config SND_USB_CAIAQ_INPUT
           alpha dials and analog pedals on the following products:
 
            * Native Instruments RigKontrol2
+           * Native Instruments RigKontrol3
            * Native Instruments Audio Kontrol 1
 
 endmenu
diff --git a/sound/usb/caiaq/caiaq-audio.c b/sound/usb/caiaq/caiaq-audio.c
index 0414d766ba07..0666908a2361 100644
--- a/sound/usb/caiaq/caiaq-audio.c
+++ b/sound/usb/caiaq/caiaq-audio.c
@@ -648,6 +648,7 @@ int __devinit snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev)
         dev->samplerates = dev->pcm_info.rates;
         switch (dev->chip.usb_id) {
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
                 dev->samplerates |= SNDRV_PCM_RATE_88200;
                 dev->samplerates |= SNDRV_PCM_RATE_192000;
                 break;
diff --git a/sound/usb/caiaq/caiaq-device.c b/sound/usb/caiaq/caiaq-device.c
index 4709347326f9..58af8142c571 100644
--- a/sound/usb/caiaq/caiaq-device.c
+++ b/sound/usb/caiaq/caiaq-device.c
@@ -41,9 +41,10 @@
 #endif
 
 MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("caiaq USB audio, version 1.1.0");
+MODULE_DESCRIPTION("caiaq USB audio, version 1.2.0");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
+                         "{Native Instruments, RigKontrol3},"
                          "{Native Instruments, Kore Controller},"
                          "{Native Instruments, Audio Kontrol 1}"
                          "{Native Instruments, Audio 8 DJ}}");
@@ -85,6 +86,11 @@ static struct usb_device_id snd_usb_id_table[] = {
         {
                 .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
                 .idVendor =     USB_VID_NATIVEINSTRUMENTS,
+                .idProduct =    USB_PID_RIGKONTROL3
+        },
+        {
+                .match_flags =  USB_DEVICE_ID_MATCH_DEVICE,
+                .idVendor =     USB_VID_NATIVEINSTRUMENTS,
                 .idProduct =    USB_PID_KORECONTROLLER
         },
         {
@@ -226,7 +232,7 @@ int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev,
 static void setup_card(struct snd_usb_caiaqdev *dev)
 {
         int ret;
-        char val[3];
+        char val[4];
         
         /* device-specific startup specials */
         switch (dev->chip.usb_id) {
@@ -237,6 +243,14 @@ static void setup_card(struct snd_usb_caiaqdev *dev)
                 val[2] = 0x01;
                 send_command(dev, EP1_CMD_WRITE_IO, val, 3);
                 break;
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+                /* RigKontrol2 - display two centered dashes ('--') */
+                val[0] = 0x00;
+                val[1] = 0x40;
+                val[2] = 0x40;
+                val[3] = 0x00;
+                send_command(dev, EP1_CMD_WRITE_IO, val, 4);
+                break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 /* Audio Kontrol 1 - make USB-LED stop blinking */
                 val[0] = 0x00;
diff --git a/sound/usb/caiaq/caiaq-device.h b/sound/usb/caiaq/caiaq-device.h
index 088d5ec241f3..79bc5be2df7a 100644
--- a/sound/usb/caiaq/caiaq-device.h
+++ b/sound/usb/caiaq/caiaq-device.h
@@ -6,6 +6,7 @@
 #define USB_VID_NATIVEINSTRUMENTS 0x17cc
 
 #define USB_PID_RIGKONTROL2     0x1969
+#define USB_PID_RIGKONTROL3     0x1940
 #define USB_PID_KORECONTROLLER  0x4711
 #define USB_PID_AK1             0x0815
 #define USB_PID_AUDIO8DJ        0x1978
diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c
index 3acd12db6952..a1de0c608957 100644
--- a/sound/usb/caiaq/caiaq-input.c
+++ b/sound/usb/caiaq/caiaq-input.c
@@ -34,6 +34,8 @@
 static unsigned char keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
 static unsigned char keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4, 
                                         KEY_5, KEY_6, KEY_7 };
+static unsigned char keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
+                                        KEY_5, KEY_6, KEY_7, KEY_5, KEY_6 };
 
 #define DEG90  (range/2)
 #define DEG180 (range)
@@ -107,7 +109,8 @@ static unsigned int decode_erp(unsigned char a, unsigned char b)
 
 
 static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, 
-                                        const char *buf, unsigned int len)
+                                        const unsigned char *buf,
+                                        unsigned int len)
 {
         switch(dev->input_dev->id.product) {
         case USB_PID_RIGKONTROL2:
@@ -116,6 +119,12 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev,
                 input_report_abs(dev->input_dev, ABS_Z, (buf[2] << 8) |buf[3]);
                 input_sync(dev->input_dev);
                 break;
+        case USB_PID_RIGKONTROL3:
+                input_report_abs(dev->input_dev, ABS_X, (buf[0] << 8) |buf[1]);
+                input_report_abs(dev->input_dev, ABS_Y, (buf[2] << 8) |buf[3]);
+                input_report_abs(dev->input_dev, ABS_Z, (buf[4] << 8) |buf[5]);
+                input_sync(dev->input_dev);
+                break;
         }
 }
 
@@ -128,7 +137,7 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
         case USB_PID_AK1:
                 i = decode_erp(buf[0], buf[1]);
                 input_report_abs(dev->input_dev, ABS_X, i);
-                input_sync(dev->input_dev);     
+                input_sync(dev->input_dev);
                 break;
         }
 }
@@ -204,6 +213,20 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);
                 snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
                 break;
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+                input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_Z);
+                input->keycode = keycode_rk3;
+                input->keycodesize = sizeof(char);
+                input->keycodemax = ARRAY_SIZE(keycode_rk3);
+                for (i=0; i<ARRAY_SIZE(keycode_rk3); i++)
+                        set_bit(keycode_rk3[i], input->keybit);
+
+                input_set_abs_params(input, ABS_X, 0, 1024, 0, 10);
+                input_set_abs_params(input, ABS_Y, 0, 1024, 0, 10);
+                input_set_abs_params(input, ABS_Z, 0, 1024, 0, 10);
+                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
+                break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
                 input->absbit[0] = BIT(ABS_X);
@@ -238,7 +261,6 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev)
                 return;
 
         input_unregister_device(dev->input_dev);
-        input_free_device(dev->input_dev);
         dev->input_dev = NULL;
 }
 
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index ac5666f4c6d5..967b823eace0 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -123,7 +123,6 @@ struct audioformat {
         unsigned int rate_min, rate_max;        /* min/max rates */
         unsigned int nr_rates;          /* number of rate table entries */
         unsigned int *rate_table;       /* rate table */
-        unsigned int needs_knot;        /* any unusual rates? */
 };
 
 struct snd_usb_substream;
@@ -1309,7 +1308,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
 
         /* close the old interface */
         if (subs->interface >= 0 && subs->interface != fmt->iface) {
-                usb_set_interface(subs->dev, subs->interface, 0);
+                if (usb_set_interface(subs->dev, subs->interface, 0) < 0) {
+                        snd_printk(KERN_ERR "%d:%d:%d: return to setting 0 failed\n",
+                                dev->devnum, fmt->iface, fmt->altsetting);
+                        return -EIO;
+                }
                 subs->interface = -1;
                 subs->format = 0;
         }
@@ -1761,7 +1764,7 @@ static int check_hw_params_convention(struct snd_usb_substream *subs)
                 channels[f->format] |= (1 << f->channels);
                 rates[f->format] |= f->rates;
                 /* needs knot? */
-                if (f->needs_knot)
+                if (f->rates & SNDRV_PCM_RATE_KNOT)
                         goto __out;
         }
         /* check whether channels and rates match for all formats */
@@ -1817,7 +1820,7 @@ static int snd_usb_pcm_check_knot(struct snd_pcm_runtime *runtime,
                 if (fp->rates & SNDRV_PCM_RATE_CONTINUOUS)
                         return 0;
                 count += fp->nr_rates;
-                if (fp->needs_knot)
+                if (fp->rates & SNDRV_PCM_RATE_KNOT)
                         needs_knot = 1;
         }
         if (!needs_knot)
@@ -2453,7 +2456,7 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                                     unsigned char *fmt, int offset)
 {
         int nr_rates = fmt[offset];
-        int found;
+
         if (fmt[0] < offset + 1 + 3 * (nr_rates ? nr_rates : 2)) {
                 snd_printk(KERN_ERR "%d:%u:%d : invalid FORMAT_TYPE desc\n",
                                    chip->dev->devnum, fp->iface, fp->altsetting);
@@ -2464,20 +2467,15 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                 /*
                  * build the rate table and bitmap flags
                  */
-                int r, idx, c;
+                int r, idx;
                 unsigned int nonzero_rates = 0;
-                /* this table corresponds to the SNDRV_PCM_RATE_XXX bit */
-                static unsigned int conv_rates[] = {
-                        5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,
-                        64000, 88200, 96000, 176400, 192000
-                };
+
                 fp->rate_table = kmalloc(sizeof(int) * nr_rates, GFP_KERNEL);
                 if (fp->rate_table == NULL) {
                         snd_printk(KERN_ERR "cannot malloc\n");
                         return -1;
                 }
 
-                fp->needs_knot = 0;
                 fp->nr_rates = nr_rates;
                 fp->rate_min = fp->rate_max = combine_triple(&fmt[8]);
                 for (r = 0, idx = offset + 1; r < nr_rates; r++, idx += 3) {
@@ -2493,23 +2491,12 @@ static int parse_audio_format_rates(struct snd_usb_audio *chip, struct audioform
                                 fp->rate_min = rate;
                         else if (rate > fp->rate_max)
                                 fp->rate_max = rate;
-                        found = 0;
-                        for (c = 0; c < (int)ARRAY_SIZE(conv_rates); c++) {
-                                if (rate == conv_rates[c]) {
-                                        found = 1;
-                                        fp->rates |= (1 << c);
-                                        break;
-                                }
-                        }
-                        if (!found)
-                                fp->needs_knot = 1;
+                        fp->rates |= snd_pcm_rate_to_rate_bit(rate);
                 }
                 if (!nonzero_rates) {
                         hwc_debug("All rates were zero. Skipping format!\n");
                         return -1;
                 }
-                if (fp->needs_knot)
-                        fp->rates |= SNDRV_PCM_RATE_KNOT;
         } else {
                 /* continuous rates */
                 fp->rates = SNDRV_PCM_RATE_CONTINUOUS;
@@ -2857,6 +2844,10 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif)
                         /* skip non-supported classes */
                         continue;
                 }
+                if (snd_usb_get_speed(dev) == USB_SPEED_LOW) {
+                        snd_printk(KERN_ERR "low speed audio streaming not supported\n");
+                        continue;
+                }
                 if (! parse_audio_endpoints(chip, j)) {
                         usb_set_interface(dev, j, 0); /* reset the current interface */
                         usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
@@ -3399,7 +3390,8 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
 
         *rchip = NULL;
 
-        if (snd_usb_get_speed(dev) != USB_SPEED_FULL &&
+        if (snd_usb_get_speed(dev) != USB_SPEED_LOW &&
+            snd_usb_get_speed(dev) != USB_SPEED_FULL &&
             snd_usb_get_speed(dev) != USB_SPEED_HIGH) {
                 snd_printk(KERN_ERR "unknown device speed %d\n", snd_usb_get_speed(dev));
                 return -ENXIO;
@@ -3473,7 +3465,9 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
                 usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
 
         strlcat(card->longname,
-                snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" : ", high speed",
+                snd_usb_get_speed(dev) == USB_SPEED_LOW ? ", low speed" :
+                snd_usb_get_speed(dev) == USB_SPEED_FULL ? ", full speed" :
+                ", high speed",
                 sizeof(card->longname));
 
         snd_usb_audio_create_proc(chip);
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 99295f9b7691..6330788c1c2b 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -407,6 +407,20 @@ static void snd_usbmidi_maudio_broken_running_status_input(
 }
 
 /*
+ * CME protocol: like the standard protocol, but SysEx commands are sent as a
+ * single USB packet preceded by a 0x0F byte.
+ */
+static void snd_usbmidi_cme_input(struct snd_usb_midi_in_endpoint *ep,
+                                  uint8_t *buffer, int buffer_length)
+{
+        if (buffer_length < 2 || (buffer[0] & 0x0f) != 0x0f)
+                snd_usbmidi_standard_input(ep, buffer, buffer_length);
+        else
+                snd_usbmidi_input_data(ep, buffer[0] >> 4,
+                                       &buffer[1], buffer_length - 1);
+}
+
+/*
  * Adds one USB MIDI packet to the output buffer.
  */
 static void snd_usbmidi_output_standard_packet(struct urb* urb, uint8_t p0,
@@ -572,6 +586,12 @@ static struct usb_protocol_ops snd_usbmidi_maudio_broken_running_status_ops = {
         .output_packet = snd_usbmidi_output_standard_packet,
 };
 
+static struct usb_protocol_ops snd_usbmidi_cme_ops = {
+        .input = snd_usbmidi_cme_input,
+        .output = snd_usbmidi_standard_output,
+        .output_packet = snd_usbmidi_output_standard_packet,
+};
+
 /*
  * Novation USB MIDI protocol: number of data bytes is in the first byte
  * (when receiving) (+1!) or in the second byte (when sending); data begins
@@ -963,8 +983,10 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
                 snd_usbmidi_out_endpoint_delete(ep);
                 return -ENOMEM;
         }
-        /* we never use interrupt output pipes */
-        pipe = usb_sndbulkpipe(umidi->chip->dev, ep_info->out_ep);
+        if (ep_info->out_interval)
+                pipe = usb_sndintpipe(umidi->chip->dev, ep_info->out_ep);
+        else
+                pipe = usb_sndbulkpipe(umidi->chip->dev, ep_info->out_ep);
         if (umidi->chip->usb_id == USB_ID(0x0a92, 0x1020)) /* ESI M4U */
                 /* FIXME: we need more URBs to get reasonable bandwidth here: */
                 ep->max_transfer = 4;
@@ -976,8 +998,14 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
                 snd_usbmidi_out_endpoint_delete(ep);
                 return -ENOMEM;
         }
-        usb_fill_bulk_urb(ep->urb, umidi->chip->dev, pipe, buffer,
-                          ep->max_transfer, snd_usbmidi_out_urb_complete, ep);
+        if (ep_info->out_interval)
+                usb_fill_int_urb(ep->urb, umidi->chip->dev, pipe, buffer,
+                                 ep->max_transfer, snd_usbmidi_out_urb_complete,
+                                 ep, ep_info->out_interval);
+        else
+                usb_fill_bulk_urb(ep->urb, umidi->chip->dev,
+                                  pipe, buffer, ep->max_transfer,
+                                  snd_usbmidi_out_urb_complete, ep);
         ep->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
 
         spin_lock_init(&ep->buffer_lock);
@@ -1323,6 +1351,13 @@ static int snd_usbmidi_get_ms_info(struct snd_usb_midi* umidi,
                         endpoints[epidx].out_ep = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
                         if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
                                 endpoints[epidx].out_interval = ep->bInterval;
+                        else if (snd_usb_get_speed(umidi->chip->dev) == USB_SPEED_LOW)
+                                /*
+                                 * Low speed bulk transfers don't exist, so
+                                 * force interrupt transfers for devices like
+                                 * ESI MIDI Mate that try to use them anyway.
+                                 */
+                                endpoints[epidx].out_interval = 1;
                         endpoints[epidx].out_cables = (1 << ms_ep->bNumEmbMIDIJack) - 1;
                         snd_printdd(KERN_INFO "EP %02X: %d jack(s)\n",
                                     ep->bEndpointAddress, ms_ep->bNumEmbMIDIJack);
@@ -1336,6 +1371,8 @@ static int snd_usbmidi_get_ms_info(struct snd_usb_midi* umidi,
                         endpoints[epidx].in_ep = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
                         if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)
                                 endpoints[epidx].in_interval = ep->bInterval;
+                        else if (snd_usb_get_speed(umidi->chip->dev) == USB_SPEED_LOW)
+                                endpoints[epidx].in_interval = 1;
                         endpoints[epidx].in_cables = (1 << ms_ep->bNumEmbMIDIJack) - 1;
                         snd_printdd(KERN_INFO "EP %02X: %d jack(s)\n",
                                     ep->bEndpointAddress, ms_ep->bNumEmbMIDIJack);
@@ -1690,6 +1727,7 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
                 err = snd_usbmidi_detect_endpoints(umidi, &endpoints[0], 1);
                 break;
         case QUIRK_MIDI_CME:
+                umidi->usb_protocol_ops = &snd_usbmidi_cme_ops;
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
         default:
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c
index 325d4b6b54aa..5e329690cfb1 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/usbmixer.c
@@ -1483,7 +1483,7 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, unsi
         struct snd_kcontrol *kctl;
         char **namelist;
 
-        if (! num_ins || desc[0] < 6 + num_ins) {
+        if (! num_ins || desc[0] < 5 + num_ins) {
                 snd_printk(KERN_ERR "invalid SELECTOR UNIT descriptor %d\n", unitid);
                 return -EINVAL;
         }
@@ -1888,14 +1888,7 @@ static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
         return 0;
 }
 
-static int snd_audigy2nx_led_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
+#define snd_audigy2nx_led_info          snd_ctl_boolean_mono_info
 
 static int snd_audigy2nx_led_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 5a2f518c6629..743568f89907 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -88,7 +88,19 @@
         .bInterfaceClass = USB_CLASS_AUDIO,
         .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL
 },
-
+/* E-Mu devices */
+{
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f02,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
+{
+        .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+        .idVendor = 0x041e,
+        .idProduct = 0x3f04,
+        .bInterfaceClass = USB_CLASS_AUDIO,
+},
 /*
  * Yamaha devices
  */
@@ -1254,7 +1266,28 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
         /* TODO: add Edirol PC-80 support */
-        /* TODO: add Edirol UA-1EX support */
+{
+        USB_DEVICE(0x0582, 0x0096),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "EDIROL",
+                .product_name = "UA-1EX",
+                .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 = -1
+                        }
+                }
+        }
+},
 {
         USB_DEVICE(0x0582, 0x009a),
         .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
@@ -1567,6 +1600,40 @@ YAMAHA_DEVICE(0x7010, "UB99"),
                 }
         }
 },
+{
+        USB_DEVICE(0x0763, 0x2019),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                /* .vendor_name = "M-Audio", */
+                /* .product_name = "Ozone Academic", */
+                .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_AUDIO_STANDARD_INTERFACE
+                        },
+                        {
+                                .ifnum = 3,
+                                .type = QUIRK_MIDI_MIDIMAN,
+                                .data = & (const struct snd_usb_midi_endpoint_info) {
+                                        .out_cables = 0x0001,
+                                        .in_cables  = 0x0001
+                                }
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
 
 /* Casio devices */
 {
@@ -1709,6 +1776,24 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
+/* Stanton/N2IT Final Scratch v1 device ('Scratchamp') */
+{
+        USB_DEVICE(0x103d, 0x0100),
+                .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Stanton",
+                .product_name = "ScratchAmp",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+{
+        USB_DEVICE(0x103d, 0x0101),
+                .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Stanton",
+                .product_name = "ScratchAmp",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+
 /* Novation EMS devices */
 {
         USB_DEVICE_VENDOR_SPEC(0x1235, 0x0001),
@@ -1738,6 +1823,17 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
+/* */
+{
+        /* aka. Serato Scratch Live DJ Box */
+        USB_DEVICE(0x13e5, 0x0001),
+        .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
+                .vendor_name = "Rane",
+                .product_name = "SL-1",
+                .ifnum = QUIRK_NO_INTERFACE
+        }
+},
+
 /* Miditech devices */
 {
         USB_DEVICE(0x4752, 0x0011),