From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:48:55 +0000 (+0800)
Subject: Revert "drivers: usb: gadget: handle NULL descriptors in composite config_buf"
X-Git-Tag: firefly_0821_release~9917
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6555e530d8a41f5fde40d8faf9feee99631c255a;p=firefly-linux-kernel-4.4.55.git

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 9c333f1cc62a..d05397ec8a18 100755
--- 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)