From 0f63be217580f90d85affb7c14921b73a540aa47 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Fri, 26 Feb 2010 09:34:19 -0500 Subject: USB: gadget: composite: Don't increment interface number for alt settings. Signed-off-by: Mike Lockwood --- drivers/usb/gadget/composite.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index cf7a5cf8503..fa785c6cfd6 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -326,8 +326,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; } -- cgit v1.2.3