3 files changed, 80 insertions, 3 deletions

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index b8e0b8fda607..8a8f62515b80 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3312,6 +3312,32 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev)
 }
 
 /*
+ * This call will put the synth in "USB send" mode, i.e it will send MIDI
+ * messages through USB (this is disabled at startup). The synth will
+ * acknowledge by sending a sysex on endpoint 0x85 and by displaying a USB
+ * sign on its LCD. Values here are chosen based on sniffing USB traffic
+ * under Windows.
+ */
+static int snd_usb_accessmusic_boot_quirk(struct usb_device *dev)
+{
+        int err, actual_length;
+
+        /* "midi send" enable */
+        static const u8 seq[] = { 0x4e, 0x73, 0x52, 0x01 };
+
+        void *buf = kmemdup(seq, ARRAY_SIZE(seq), GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+        err = usb_interrupt_msg(dev, usb_sndintpipe(dev, 0x05), buf,
+                        ARRAY_SIZE(seq), &actual_length, 1000);
+        kfree(buf);
+        if (err < 0)
+                return err;
+
+        return 0;
+}
+
+/*
  * Setup quirks
  */
 #define AUDIOPHILE_SET                  0x01 /* if set, parse device_setup */
@@ -3609,6 +3635,12 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
                         goto __err_val;
         }
 
+        /* Access Music VirusTI Desktop */
+        if (id == USB_ID(0x133e, 0x0815)) {
+                if (snd_usb_accessmusic_boot_quirk(dev) < 0)
+                        goto __err_val;
+        }
+
         /*
          * found a config.  now register to ALSA
          */
diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 6e89b8368d9a..b2da478a0fae 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1162,10 +1162,22 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
                 pipe = usb_sndintpipe(umidi->dev, ep_info->out_ep);
         else
                 pipe = usb_sndbulkpipe(umidi->dev, ep_info->out_ep);
-        if (umidi->usb_id == USB_ID(0x0a92, 0x1020)) /* ESI M4U */
-                ep->max_transfer = 4;
-        else
+        switch (umidi->usb_id) {
+        default:
                 ep->max_transfer = usb_maxpacket(umidi->dev, pipe, 1);
+                break;
+                /*
+                 * Various chips declare a packet size larger than 4 bytes, but
+                 * do not actually work with larger packets:
+                 */
+        case USB_ID(0x0a92, 0x1020): /* ESI M4U */
+        case USB_ID(0x1430, 0x474b): /* RedOctane GH MIDI INTERFACE */
+        case USB_ID(0x15ca, 0x0101): /* Textech USB Midi Cable */
+        case USB_ID(0x15ca, 0x1806): /* Textech USB Midi Cable */
+        case USB_ID(0x1a86, 0x752d): /* QinHeng CH345 "USB2.0-MIDI" */
+                ep->max_transfer = 4;
+                break;
+        }
         for (i = 0; i < OUTPUT_URBS; ++i) {
                 buffer = usb_buffer_alloc(umidi->dev,
                                           ep->max_transfer, GFP_KERNEL,
@@ -1407,6 +1419,12 @@ static struct port_info {
         EXTERNAL_PORT(0x086a, 0x0001, 8, "%s Broadcast"),
         EXTERNAL_PORT(0x086a, 0x0002, 8, "%s Broadcast"),
         EXTERNAL_PORT(0x086a, 0x0003, 4, "%s Broadcast"),
+        /* Access Music Virus TI */
+        EXTERNAL_PORT(0x133e, 0x0815, 0, "%s MIDI"),
+        PORT_INFO(0x133e, 0x0815, 1, "%s Synth", 0,
+                SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
+                SNDRV_SEQ_PORT_TYPE_HARDWARE |
+                SNDRV_SEQ_PORT_TYPE_SYNTHESIZER),
 };
 
 static struct port_info *find_port_info(struct snd_usb_midi* umidi, int number)
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 65bbd22f2e0c..e691eba6a83e 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -2042,6 +2042,33 @@ YAMAHA_DEVICE(0x7010, "UB99"),
         }
 },
 
+/* Access Music devices */
+{
+        /* VirusTI Desktop */
+        USB_DEVICE_VENDOR_SPEC(0x133e, 0x0815),
+        .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 = 3,
+                                .type = QUIRK_MIDI_FIXED_ENDPOINT,
+                                .data = &(const struct snd_usb_midi_endpoint_info) {
+                                        .out_cables = 0x0003,
+                                        .in_cables  = 0x0003
+                                }
+                        },
+                        {
+                                .ifnum = 4,
+                                .type = QUIRK_IGNORE_INTERFACE
+                        },
+                        {
+                                .ifnum = -1
+                        }
+                }
+        }
+},
+
 /* */
 {
         /* aka. Serato Scratch Live DJ Box */