diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-08-25 14:55:05 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-30 10:38:33 +0100 |
| commit | 5f322f20a3a721ea0b094dc695f3b6e24bd556a0 (patch) | |
| tree | 5bd2f1b77f08060653619a4b01419702759bdb41 | |
| parent | 07784c9a2a8b820617d563d0d0c3ab874f0c6377 (diff) | |
| download | linux-stable-5f322f20a3a721ea0b094dc695f3b6e24bd556a0.tar.gz linux-stable-5f322f20a3a721ea0b094dc695f3b6e24bd556a0.tar.bz2 linux-stable-5f322f20a3a721ea0b094dc695f3b6e24bd556a0.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.c | 2 |
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 09bc917d407d..e4aa370e86a9 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -1523,7 +1523,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; |