From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:26:28 +0000 (+0800)
Subject: Revert "USB: gadget: composite: Don't increment interface number for alt settings."
X-Git-Tag: firefly_0821_release~9995
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a59b808905fc3017d1d8d137842946dd183d8ba2;p=firefly-linux-kernel-4.4.55.git

Revert "USB: gadget: composite: Don't increment interface number for alt settings."

This reverts commit b1d4000fe60cec6a05fd09b7a6697ede7ab649a2.
---

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 08bcecbb934c..aac724ae664b 100755
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -322,13 +322,8 @@ static int config_buf(struct usb_configuration *config,
 		dest = next;
 		while ((descriptor = *descriptors++) != NULL) {
 			intf = (struct usb_interface_descriptor *)dest;
-			if (intf->bDescriptorType == USB_DT_INTERFACE) {
-				/* don't increment bInterfaceNumber for alternate settings */
-				if (intf->bAlternateSetting == 0)
-					intf->bInterfaceNumber = interfaceCount++;
-				else
-					intf->bInterfaceNumber = interfaceCount - 1;
-			}
+			if (intf->bDescriptorType == USB_DT_INTERFACE)
+				intf->bInterfaceNumber = interfaceCount++;
 			dest += intf->bLength;
 		}