summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/config.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2023-03-17 15:35:08 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2023-03-24 09:34:25 +0100
commitf49f040bf0b6dc72a04d4eed9ddb08cdedf030d0 (patch)
treeebb184059171828369887b157cdaf8133d34e784 /drivers/usb/gadget/config.c
parentade97d9b010140cd530623ebfaab11950bb0a5bd (diff)
downloadbarebox-f49f040bf0b6dc72a04d4eed9ddb08cdedf030d0.tar.gz
usb: gadget: Add super-speed-plus descriptors
Linux upstream usb_assign_descriptors() now takes four sets of descriptors. Add the missing super speed plus descriptors. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/gadget/config.c')
-rw-r--r--drivers/usb/gadget/config.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c
index 979cfafa70..27e4dda52f 100644
--- a/drivers/usb/gadget/config.c
+++ b/drivers/usb/gadget/config.c
@@ -152,7 +152,8 @@ EXPORT_SYMBOL_GPL(usb_copy_descriptors);
int usb_assign_descriptors(struct usb_function *f,
struct usb_descriptor_header **fs,
struct usb_descriptor_header **hs,
- struct usb_descriptor_header **ss)
+ struct usb_descriptor_header **ss,
+ struct usb_descriptor_header **ssp)
{
struct usb_gadget *g = f->config->cdev->gadget;
@@ -171,6 +172,11 @@ int usb_assign_descriptors(struct usb_function *f,
if (!f->ss_descriptors)
goto err;
}
+ if (ssp && gadget_is_superspeed_plus(g)) {
+ f->ssp_descriptors = usb_copy_descriptors(ssp);
+ if (!f->ssp_descriptors)
+ goto err;
+ }
return 0;
err:
usb_free_all_descriptors(f);