Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 31 insertions, 13 deletions

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index b9c2bc65f51a..f9289102886a 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -54,6 +54,7 @@
 #include <sound/asequencer.h>
 #include "usbaudio.h"
 #include "midi.h"
+#include "power.h"
 #include "helper.h"
 
 /*
@@ -784,7 +785,7 @@ static struct usb_protocol_ops snd_usbmidi_novation_ops = {
 };
 
 /*
- * "raw" protocol: used by the MOTU FastLane.
+ * "raw" protocol: just move raw MIDI bytes from/to the endpoint
  */
 
 static void snd_usbmidi_raw_input(struct snd_usb_midi_in_endpoint* ep,
@@ -834,7 +835,14 @@ static void snd_usbmidi_us122l_output(struct snd_usb_midi_out_endpoint *ep,
 
         if (!ep->ports[0].active)
                 return;
-        count = snd_usb_get_speed(ep->umidi->dev) == USB_SPEED_HIGH ? 1 : 2;
+        switch (snd_usb_get_speed(ep->umidi->dev)) {
+        case USB_SPEED_HIGH:
+        case USB_SPEED_SUPER:
+                count = 1;
+                break;
+        default:
+                count = 2;
+        }
         count = snd_rawmidi_transmit(ep->ports[0].substream,
                                      urb->transfer_buffer,
                                      count);
@@ -843,8 +851,8 @@ static void snd_usbmidi_us122l_output(struct snd_usb_midi_out_endpoint *ep,
                 return;
         }
 
-        memset(urb->transfer_buffer + count, 0xFD, 9 - count);
-        urb->transfer_buffer_length = count;
+        memset(urb->transfer_buffer + count, 0xFD, ep->max_transfer - count);
+        urb->transfer_buffer_length = ep->max_transfer;
 }
 
 static struct usb_protocol_ops snd_usbmidi_122l_ops = {
@@ -1037,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)
@@ -1049,6 +1058,9 @@ 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;
         substream_open(substream, 1);
@@ -1057,7 +1069,10 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream)
 
 static int snd_usbmidi_output_close(struct snd_rawmidi_substream *substream)
 {
+        struct snd_usb_midi* umidi = substream->rmidi->private_data;
+
         substream_open(substream, 0);
+        usb_autopm_put_interface(umidi->iface);
         return 0;
 }
 
@@ -1286,8 +1301,16 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi,
         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" */
+        case USB_ID(0xfc08, 0x0101): /* Unknown vendor Cable */
                 ep->max_transfer = 4;
                 break;
+                /*
+                 * Some devices only work with 9 bytes packet size:
+                 */
+        case USB_ID(0x0644, 0x800E): /* Tascam US-122L */
+        case USB_ID(0x0644, 0x800F): /* Tascam US-144 */
+                ep->max_transfer = 9;
+                break;
         }
         for (i = 0; i < OUTPUT_URBS; ++i) {
                 buffer = usb_alloc_coherent(umidi->dev,
@@ -1722,13 +1745,7 @@ static int roland_load_info(struct snd_kcontrol *kcontrol,
 {
         static const char *const names[] = { "High Load", "Light Load" };
 
-        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        info->count = 1;
-        info->value.enumerated.items = 2;
-        if (info->value.enumerated.item > 1)
-                info->value.enumerated.item = 1;
-        strcpy(info->value.enumerated.name, names[info->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(info, 1, 2, names);
 }
 
 static int roland_load_get(struct snd_kcontrol *kcontrol,
@@ -2115,7 +2132,7 @@ int snd_usbmidi_create(struct snd_card *card,
                 umidi->usb_protocol_ops = &snd_usbmidi_novation_ops;
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
-        case QUIRK_MIDI_FASTLANE:
+        case QUIRK_MIDI_RAW_BYTES:
                 umidi->usb_protocol_ops = &snd_usbmidi_raw_ops;
                 /*
                  * Interface 1 contains isochronous endpoints, but with the same
@@ -2126,7 +2143,8 @@ int snd_usbmidi_create(struct snd_card *card,
                  * interface 0, so we have to make sure that the USB core looks
                  * again at interface 0 by calling usb_set_interface() on it.
                  */
-                usb_set_interface(umidi->dev, 0, 0);
+                if (umidi->usb_id == USB_ID(0x07fd, 0x0001)) /* MOTU Fastlane */
+                        usb_set_interface(umidi->dev, 0, 0);
                 err = snd_usbmidi_detect_per_port_endpoints(umidi, endpoints);
                 break;
         case QUIRK_MIDI_EMAGIC: