Commit 116e79c6 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

usb: gadget: midi2: Fix MIDI2 IN EP max packet size 



The EP-IN of MIDI2 (altset 1) wasn't initialized in
f_midi2_create_usb_configs() as it's an INT EP unlike others BULK
EPs.  But this leaves rather the max packet size unchanged no matter
which speed is used, resulting in the very slow access.
And the wMaxPacketSize values set there look legit for INT EPs, so
let's initialize the MIDI2 EP-IN there for achieving the equivalent
speed as well.

Fixes: 8b645922 ("usb: gadget: Add support for USB MIDI 2.0 function driver")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20250905133240.20966-1-tiwai@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21d8525d

drivers/usb/gadget/function/f_midi2.c

+8 −2
Original line number Diff line number Diff line
@@ -1737,9 +1737,12 @@ static int f_midi2_create_usb_configs(struct f_midi2 *midi2, 
	case USB_SPEED_HIGH:

		midi2_midi1_ep_out_desc.wMaxPacketSize = cpu_to_le16(512);

		midi2_midi1_ep_in_desc.wMaxPacketSize = cpu_to_le16(512);

		for (i = 0; i < midi2->num_eps; i++)

		for (i = 0; i < midi2->num_eps; i++) {

			midi2_midi2_ep_out_desc[i].wMaxPacketSize =

				cpu_to_le16(512);

			midi2_midi2_ep_in_desc[i].wMaxPacketSize =

				cpu_to_le16(512);

		}

		fallthrough;

	case USB_SPEED_FULL:

		midi1_in_eps = midi2_midi1_ep_in_descs;
@@ -1748,9 +1751,12 @@ static int f_midi2_create_usb_configs(struct f_midi2 *midi2, 
	case USB_SPEED_SUPER:

		midi2_midi1_ep_out_desc.wMaxPacketSize = cpu_to_le16(1024);

		midi2_midi1_ep_in_desc.wMaxPacketSize = cpu_to_le16(1024);

		for (i = 0; i < midi2->num_eps; i++)

		for (i = 0; i < midi2->num_eps; i++) {

			midi2_midi2_ep_out_desc[i].wMaxPacketSize =

				cpu_to_le16(1024);

			midi2_midi2_ep_in_desc[i].wMaxPacketSize =

				cpu_to_le16(1024);

		}

		midi1_in_eps = midi2_midi1_ep_in_ss_descs;

		midi1_out_eps = midi2_midi1_ep_out_ss_descs;

		break;