shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2010-02-26 09:34:19 -05:00
committed by Colin Cross
parent 8c6a6b2180
commit 0f63be2175
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/gadget/composite.c
View File

@@ -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;
}