Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5709321f authored by Felipe F. Tonello's avatar Felipe F. Tonello Committed by Greg Kroah-Hartman
Browse files

usb: gadget: f_midi: Fixed a bug when buflen was smaller than wMaxPacketSize 



commit 03d27ade4941076b34c823d63d91dc895731a595 upstream.

buflen by default (256) is smaller than wMaxPacketSize (512) in high-speed
devices.

That caused the OUT endpoint to freeze if the host send any data packet of
length greater than 256 bytes.

This is an example dump of what happended on that enpoint:
HOST:   [DATA][Length=260][...]
DEVICE: [NAK]
HOST:   [PING]
DEVICE: [NAK]
HOST:   [PING]
DEVICE: [NAK]
...
HOST:   [PING]
DEVICE: [NAK]

This patch fixes this problem by setting the minimum usb_request's buffer size
for the OUT endpoint as its wMaxPacketSize.

Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe F. Tonello <eu@felipetonello.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e19487b

drivers/usb/gadget/function/f_midi.c

+3 −1
Original line number Diff line number Diff line
@@ -361,7 +361,9 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 
	/* allocate a bunch of read buffers and queue them all at once. */

	for (i = 0; i < midi->qlen && err == 0; i++) {

		struct usb_request *req =

			midi_alloc_ep_req(midi->out_ep, midi->buflen);

			midi_alloc_ep_req(midi->out_ep,

				max_t(unsigned, midi->buflen,

					bulk_out_desc.wMaxPacketSize));

		if (req == NULL)

			return -ENOMEM;