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

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

Browse Source 
This reverts commit b1d4000fe6.
This commit is contained in:
黄涛
2011-07-30 22:26:28 +08:00
parent 4c9ec236d2
commit a59b808905
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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