diff options
| author | Jared Suttles <jared.suttles@motorola.com> | 2009-07-30 16:13:27 -0500 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:08:53 -0700 |
| commit | 646bb86a454b23d4792883a8d1fd83a87a333f0c (patch) | |
| tree | 98a824d3840f9ae65ce1769b7f052d8c0a54b447 /drivers/usb | |
| parent | 7f0d7bd310cad696f8a17e270f174ffcd1eb4f14 (diff) | |
| download | kernel_samsung_aries-646bb86a454b23d4792883a8d1fd83a87a333f0c.zip kernel_samsung_aries-646bb86a454b23d4792883a8d1fd83a87a333f0c.tar.gz kernel_samsung_aries-646bb86a454b23d4792883a8d1fd83a87a333f0c.tar.bz2 | |
drivers: usb: gadget: handle NULL descriptors in composite config_buf
This fixes a problem in enumeration after a gadget function is removed.
Submitted on behalf of RaviKumar Vembu <ravi.v@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 5cbb1a4..a1a54b4 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -240,6 +240,7 @@ 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; @@ -270,8 +271,16 @@ static int config_buf(struct usb_configuration *config, descriptors = f->hs_descriptors; else descriptors = f->descriptors; - if (!descriptors) + if (!descriptors || descriptors[0] == NULL) { + for (; f != config->interface[interfaceCount];) { + interfaceCount++; + c->bNumInterfaces--; + } continue; + } + for (; f != config->interface[interfaceCount];) + interfaceCount++; + status = usb_descriptor_fillbuf(next, len, (const struct usb_descriptor_header **) descriptors); if (status < 0) |