From: Mike Lockwood <lockwood@android.com>
Date: Fri, 26 Feb 2010 14:34:19 +0000 (-0500)
Subject: USB: gadget: composite: Don't increment interface number for alt settings.
X-Git-Tag: firefly_0821_release~9833^2~5^2~226
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d3d0cbff7273c399634df13b620b7fb82455a311;p=firefly-linux-kernel-4.4.55.git

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

Signed-off-by: Mike Lockwood <lockwood@android.com>
---

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 61dcd0cc9d10..320da923fe09 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -322,8 +322,13 @@ 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)
-				intf->bInterfaceNumber = interfaceCount++;
+			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;
+			}
 			dest += intf->bLength;
 		}