aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2020-08-25 14:55:05 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 09:58:11 +0100
commit3c7ccd7d4aceebbd1fc3f96db0d900f3dc099b59 (patch)
treea22993b45a9f5a6acf0ee690ee2df6db4d076247
parentefb893a56cea0b489a8802ddc4c4f61a2063ee5b (diff)
downloadlinux-yocto-3c7ccd7d4aceebbd1fc3f96db0d900f3dc099b59.tar.gz
linux-yocto-3c7ccd7d4aceebbd1fc3f96db0d900f3dc099b59.tar.bz2
linux-yocto-3c7ccd7d4aceebbd1fc3f96db0d900f3dc099b59.zip
usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets.
[ Upstream commit 7974ecd7d3c0f42a98566f281e44ea8573a2ad88 ] Currently, enabling f_ncm at SuperSpeed Plus speeds results in an oops in config_ep_by_speed because ncm_set_alt passes in NULL ssp_descriptors. Fix this by re-using the SuperSpeed descriptors. This is safe because usb_assign_descriptors calls usb_copy_descriptors. Tested: enabled f_ncm on a dwc3 gadget and 10Gbps link, ran iperf Reviewed-by: Maciej ┼╗enczykowski <maze@google.com> Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: Felipe Balbi <balbi@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/usb/gadget/function/f_ncm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c
index 7672fa25085b..92a7c3a83945 100644
--- a/drivers/usb/gadget/function/f_ncm.c
+++ b/drivers/usb/gadget/function/f_ncm.c
@@ -1536,7 +1536,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f)
fs_ncm_notify_desc.bEndpointAddress;
status = usb_assign_descriptors(f, ncm_fs_function, ncm_hs_function,
- ncm_ss_function, NULL);
+ ncm_ss_function, ncm_ss_function);
if (status)
goto fail;