Revert "drivers: usb: gadget: handle NULL descriptors in composite config_buf"

This reverts commit f355c97f4caa2f12b6561ccf2497c4860e47a572.

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 9c333f1cc62a5626c1537f7b4d5a9a682b895b3f..d05397ec8a183ebb4467b10f55fe9b67e1cce189 100755 (executable)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -236,7 +236,6 @@ static int config_buf(struct usb_configuration *config,
        int                             len = USB_BUFSIZ - USB_DT_CONFIG_SIZE;
        struct usb_function             *f;
        int                             status;
-       int                             interfaceCount = 0;
 
        /* write the config descriptor */
        c = buf;
@@ -267,16 +266,8 @@ static int config_buf(struct usb_configuration *config,
                        descriptors = f->hs_descriptors;
                else
                        descriptors = f->descriptors;
-               if (!descriptors || descriptors[0] == NULL) {
-                       for (; f != config->interface[interfaceCount];) {
-                               interfaceCount++;
-                               c->bNumInterfaces--;
-                       }
+               if (!descriptors)
                        continue;
-               }
-               for (; f != config->interface[interfaceCount];)
-                       interfaceCount++;
-
                status = usb_descriptor_fillbuf(next, len,
                        (const struct usb_descriptor_header **) descriptors);
                if (status < 0)