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 08bcecbb934cc890d5273855bf83db13da1309b8..aac724ae664bb859ac68222239b053c4dc0c96af 100755 (executable)
--- 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;
                }