From: "taehyun.cho" <taehyun....@samsung.com>

Setup the descriptors for SuperSpeed Plus for f_fs. This allows the
gadget to work properly without crashing at SuperSpeed rates.

Cc: Felipe Balbi <ba...@kernel.org>
Cc: Peter Chen <peter.c...@nxp.com>
Cc: stable <sta...@vger.kernel.org>
Signed-off-by: taehyun.cho <taehyun....@samsung.com>
Signed-off-by: Will McVicker <willmcvic...@google.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/usb/gadget/function/f_fs.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/usb/gadget/function/f_fs.c 
b/drivers/usb/gadget/function/f_fs.c
index 046f770a76da..a34a7c96a1ab 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -1327,6 +1327,7 @@ static long ffs_epfile_ioctl(struct file *file, unsigned 
code,
                struct usb_endpoint_descriptor *desc;
 
                switch (epfile->ffs->gadget->speed) {
+               case USB_SPEED_SUPER_PLUS:
                case USB_SPEED_SUPER:
                        desc_idx = 2;
                        break;
@@ -3222,6 +3223,10 @@ static int _ffs_func_bind(struct usb_configuration *c,
        func->function.os_desc_n =
                c->cdev->use_os_string ? ffs->interfaces_count : 0;
 
+       if (likely(super)) {
+               func->function.ssp_descriptors =
+                       usb_copy_descriptors(func->function.ss_descriptors);
+       }
        /* And we're done */
        ffs_event_add(ffs, FUNCTIONFS_BIND);
        return 0;
-- 
2.29.2

Reply via email to