diff options
| author | Oleg Matcovschi <olegmatcovsky@gmail.com> | 2011-03-11 10:24:30 -0800 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-03-30 11:24:52 -0700 |
| commit | 4c99196f6edb50764433d35adaf868ea5cb67a44 (patch) | |
| tree | e58155a8a04b5cc50a130dc689cfee94f1312ac6 | |
| parent | b1a32d7407f2cbcc278bf6c077e699a5ad362d51 (diff) | |
| download | experimental-4c99196f6edb50764433d35adaf868ea5cb67a44.tar.gz | |
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 b077585df35..920de9baaee 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 |