diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-04-19 08:59:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-04-19 08:59:15 +0200 |
| commit | e0f1115ebb757cebbc0cf7dd92a586e3dad19b77 (patch) | |
| tree | f694ff849990cbfa962f49954266b5aa6eadf7eb /drivers/usb/gadget/config.c | |
| parent | d5a06d4800305af6740cde3894d8f4b65b26b392 (diff) | |
| parent | 0a73158341d5d3ef1e79e0d77a177121ef502930 (diff) | |
| download | barebox-e0f1115ebb757cebbc0cf7dd92a586e3dad19b77.tar.gz | |
Merge branch 'for-next/usb'
Diffstat (limited to 'drivers/usb/gadget/config.c')
| -rw-r--r-- | drivers/usb/gadget/config.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index 369eb2ba5e..27e4dda52f 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c @@ -7,9 +7,9 @@ #include <common.h> -#include <usb/ch9.h> -#include <usb/gadget.h> -#include <usb/composite.h> +#include <linux/usb/ch9.h> +#include <linux/usb/gadget.h> +#include <linux/usb/composite.h> /** * usb_descriptor_fillbuf - fill buffer with descriptors @@ -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); |