diff options
| author | Oleg Matcovschi <olegmatcovsky@gmail.com> | 2011-03-11 10:24:30 -0800 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2011-03-29 13:58:24 -0700 |
| commit | 13a4bdfd1cf508f6ab8517b1bff62c76a2ae2d32 (patch) | |
| tree | 3de9fe5d841390c4c268e4609d9d6a6f2cedca8b | |
| parent | 17d8dc011be170084176c16a794ecb06c0e4d992 (diff) | |
usb: gadget: composite: USB_GET_CONFIGURATION must return 0 in unconfigured state.
Change-Id: I5212ca9990308d0c4ae6a55c60cba42d6b0e4fee
Signed-off-by: Oleg Matcovschi <olegmatcovsky@gmail.com>
| -rw-r--r-- | drivers/usb/gadget/composite.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 8c14294724c..b793304d796 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1001,12 +1001,11 @@ 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; - value = min(w_length, (u16) 1); - } else { + else *(u8 *)req->buf = 0; - } + value = min(w_length, (u16) 1); break; /* function drivers must handle get/set altsetting; if there's |