From: Karsten Wiese Date: Mon, 3 Jan 2011 01:41:58 +0000 (+0100) Subject: ALSA: snd-usb-us122l: Fix MIDI output X-Git-Tag: v2.6.36.4~172 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5625ceb657a9963f23d2cd3ea17f5a202da5db05;p=thirdparty%2Fkernel%2Fstable.git ALSA: snd-usb-us122l: Fix MIDI output commit 921eebdc18c82268eab446592191b39e35d031d6 upstream. The US-122L always reads 9 bytes per urb unless they are set to 0xFD. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/usb/midi.c b/sound/usb/midi.c index b9c2bc65f51ae..0eb1ade873457 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -843,8 +843,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 = { @@ -1288,6 +1288,13 @@ static int snd_usbmidi_out_endpoint_create(struct snd_usb_midi* umidi, case USB_ID(0x1a86, 0x752d): /* QinHeng CH345 "USB2.0-MIDI" */ ep->max_transfer = 4; break; + /* + * Some devices only work with 9 bytes packet size: + */ + case USB_ID(0x0644, 0x800E): /* Tascam US-122L */ + case USB_ID(0x0644, 0x800F): /* Tascam US-144 */ + ep->max_transfer = 9; + break; } for (i = 0; i < OUTPUT_URBS; ++i) { buffer = usb_alloc_coherent(umidi->dev,