From bce5792769ebf6a9e4c64c50feb2c800e72073c6 Mon Sep 17 00:00:00 2001 From: "taehyun.cho" Date: Thu, 15 Oct 2020 23:15:15 -0700 Subject: [PATCH] FROMLIST: USB: gadget: f_acm: add support for SuperSpeed Plus Setup the SuperSpeed Plus descriptors for f_acm. Bug: 170925797 Signed-off-by: taehyun.cho Link: https://lore.kernel.org/r/20201126180937.255892-2-gregkh@linuxfoundation.org Change-Id: I40379059d4426a523912b1514a5e5f7575576807 (cherry picked from commit 00572be28ec474d7953f1b9dd681cc2dd290d9bf) [willmcvicker: only cherry-picked f_acm portion of original patch] Signed-off-by: Will McVicker (cherry picked from commit c0e20d957704dc9d804d497fcb877ea47b7d7534) Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman --- drivers/usb/gadget/function/f_acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_acm.c b/drivers/usb/gadget/function/f_acm.c index 46647bfac2ef..349945e064bb 100644 --- a/drivers/usb/gadget/function/f_acm.c +++ b/drivers/usb/gadget/function/f_acm.c @@ -686,7 +686,7 @@ acm_bind(struct usb_configuration *c, struct usb_function *f) acm_ss_out_desc.bEndpointAddress = acm_fs_out_desc.bEndpointAddress; status = usb_assign_descriptors(f, acm_fs_function, acm_hs_function, - acm_ss_function, NULL); + acm_ss_function, acm_ss_function); if (status) goto fail;