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

Revert "drivers: usb: gadget: handle NULL descriptors in composite config_buf"

Browse Source 
This reverts commit f355c97f4c.
This commit is contained in:
黄涛
2011-07-30 22:48:55 +08:00
parent d272ce8ec2
commit 6555e530d8
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,6 @@ static int config_buf(struct usb_configuration *config,
int len = USB_BUFSIZ - USB_DT_CONFIG_SIZE;
struct usb_function *f;
int status;
int interfaceCount = 0;
/* write the config descriptor */
c = buf;
@@ -267,16 +266,8 @@ static int config_buf(struct usb_configuration *config,
descriptors = f->hs_descriptors;
else
descriptors = f->descriptors;
if (!descriptors || descriptors[0] == NULL) {
for (; f != config->interface[interfaceCount];) {
interfaceCount++;
c->bNumInterfaces--;
}
if (!descriptors)
continue;
}
for (; f != config->interface[interfaceCount];)
interfaceCount++;
status = usb_descriptor_fillbuf(next, len,
(const struct usb_descriptor_header **) descriptors);
if (status < 0)