diff options
| author | Jared Suttles <jared.suttles@motorola.com> | 2009-08-07 18:57:49 -0500 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:12:05 -0700 |
| commit | bad3f1af7ab0341d035d4552d0a21e77b843cfae (patch) | |
| tree | 04f3fea4b115edfdfff7f2edd1fc3177f10c4884 /drivers/usb/gadget/composite.c | |
| parent | 3ef3e75452bc283650168f657d74b4a6919e8a30 (diff) | |
USB: composite: Fix USB WHQL Certification Issues
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>
Change-Id: I0f286a428e8a1df5f173873233fadea987775f6b
Reviewed-on: http://git-master/r/110669
Reviewed-by: Prashant Malani <pmalani@nvidia.com>
Tested-by: Prashant Malani <pmalani@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bo Yan <byan@nvidia.com>
Rebase-Id: Rd020ea5303a19a19d143f681d95a1618a0a7a566
Diffstat (limited to 'drivers/usb/gadget/composite.c')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index ef0f2eff909f..bd647b86484b 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1322,11 +1322,12 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) case USB_REQ_GET_CONFIGURATION: if (ctrl->bRequestType != USB_DIR_IN) goto unknown; - if (cdev->config) + if (cdev->config) { *(u8 *)req->buf = cdev->config->bConfigurationValue; - else + value = min(w_length, (u16) 1); + } else { *(u8 *)req->buf = 0; - value = min(w_length, (u16) 1); + } break; /* function drivers must handle get/set altsetting; if there's |