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

Commit 0d87d144 authored by Robert Baldyga's avatar Robert Baldyga Committed by Badhri Jagan Sridharan
Browse files

usb: gadget: midi: avoid redundant f_midi_set_alt() call



Function midi registers two interfaces with single set_alt() function
which means that f_midi_set_alt() is called twice when configuration
is set. That means that endpoint initialization and ep request allocation
is done two times. To avoid this problem we do such things only once,
for interface number 1 (MIDI Streaming interface).

BACKPORT FROM MAINLINE KERNEL

Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Change-Id: I55c015c6a11180a40534671fbf505342a0032ef2
parent f803e26b
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -329,6 +329,10 @@ static int f_midi_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
	unsigned i;
	int err;

	/* For Control Device interface we do nothing */
	if (intf == 0)
		return 0;

	err = f_midi_start_ep(midi, f, midi->in_ep);
	if (err)
		return err;