Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / usb / gadget / function / f_midi.c

diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index ad50a67..a287a48 100644 (file)
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -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;