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: Dynamically set IAD bFirstInterface

Browse Source 
bFirstInterface should be set equal to bInterfaceNumber of
the first interface in a grouping. It's currently being set
only when a composite device is bound, and it does not get
updated when functions are enabled or disabled.

Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
John Michelau
2010-12-10 12:09:53 -06:00
committed by Colin Cross
parent d5d2de6539
commit f71a394a40
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,6 +305,7 @@ static int config_buf(struct usb_configuration *config,
{
struct usb_config_descriptor *c = buf;
struct usb_interface_descriptor *intf;
struct usb_interface_assoc_descriptor *iad = NULL;
void *next = buf + USB_DT_CONFIG_SIZE;
int len = USB_BUFSIZ - USB_DT_CONFIG_SIZE;
struct usb_function *f;
@@ -358,6 +359,20 @@ static int config_buf(struct usb_configuration *config,
intf->bInterfaceNumber = interfaceCount++;
else
intf->bInterfaceNumber = interfaceCount - 1;
if (iad) {
iad->bFirstInterface =
intf->bInterfaceNumber;
iad = NULL;
}
} else if (intf->bDescriptorType ==
USB_DT_INTERFACE_ASSOCIATION) {
/* This will be first if it exists. Save
* a pointer to it so we can properly set
* bFirstInterface when we process the first
* interface.
*/
iad = (struct usb_interface_assoc_descriptor *)
dest;
}
dest += intf->bLength;
}