From 743b92ddc1fc7d18b91b64f2c2e7472e87b3c4e7 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Thu, 15 Oct 2020 23:08:16 -0700 Subject: [PATCH] FROMLIST: USB: gadget: f_midi: setup SuperSpeed Plus descriptors Needed for SuperSpeed Plus support for f_midi. Bug: 170925797 Link: https://lore.kernel.org/r/20201126180937.255892-4-gregkh@linuxfoundation.org Signed-off-by: Will McVicker Change-Id: Ie16ddcb97555f4e7ef762b719ea3f7c2a251eb43 (cherry picked from commit 2746f5ffbf7a1d4ce6a933b75cf1eb4fdf7744c0) Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/function/f_midi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index e857c0fb1bfc..0dc08caab56b 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1048,6 +1048,11 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f) f->ss_descriptors = usb_copy_descriptors(midi_function); if (!f->ss_descriptors) goto fail_f_midi; + if (gadget_is_superspeed_plus(c->cdev->gadget)) { + f->ssp_descriptors = usb_copy_descriptors(midi_function); + if (!f->ssp_descriptors) + goto fail_f_midi; + } } kfree(midi_function);