2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index d8f46f6233ac..998697bd80ac 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -2247,7 +2247,8 @@ static int __ffs_data_got_descs(struct ffs_data *ffs,
                               FUNCTIONFS_HAS_MS_OS_DESC |
                               FUNCTIONFS_VIRTUAL_ADDR |
                               FUNCTIONFS_EVENTFD |
-                              FUNCTIONFS_ALL_CTRL_RECIP)) {
+                              FUNCTIONFS_ALL_CTRL_RECIP |
+                              FUNCTIONFS_CONFIG0_SETUP)) {
                         ret = -ENOSYS;
                         goto error;
                 }
@@ -3142,7 +3143,7 @@ static bool ffs_func_req_match(struct usb_function *f,
 {
         struct ffs_function *func = ffs_func_from_usb(f);
 
-        if (config0)
+        if (config0 && !(func->ffs->user_flags & FUNCTIONFS_CONFIG0_SETUP))
                 return false;
 
         switch (creq->bRequestType & USB_RECIP_MASK) {
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h
index 93da4ca82dc7..acc63697a0cc 100644
--- a/include/uapi/linux/usb/functionfs.h
+++ b/include/uapi/linux/usb/functionfs.h
@@ -22,6 +22,7 @@ enum functionfs_flags {
         FUNCTIONFS_VIRTUAL_ADDR = 16,
         FUNCTIONFS_EVENTFD = 32,
         FUNCTIONFS_ALL_CTRL_RECIP = 64,
+        FUNCTIONFS_CONFIG0_SETUP = 128,
 };
 
 /* Descriptor of an non-audio endpoint */