diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-02-26 09:34:19 -0500 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:09:05 -0700 |
| commit | 0f63be217580f90d85affb7c14921b73a540aa47 (patch) | |
| tree | 9003d383e662d1ec747b26a28b1e786be0b559f7 /drivers/usb | |
| parent | 8c6a6b21809e2c17fea5653e9e7bb87969507766 (diff) | |
| download | kernel_samsung_aries-0f63be217580f90d85affb7c14921b73a540aa47.zip kernel_samsung_aries-0f63be217580f90d85affb7c14921b73a540aa47.tar.gz kernel_samsung_aries-0f63be217580f90d85affb7c14921b73a540aa47.tar.bz2 | |
USB: gadget: composite: Don't increment interface number for alt settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index cf7a5cf..fa785c6 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; } |