On Tue, 16 Jun 2015 14:51:54 +0800 Li Jun <jun.li@xxxxxxxxxxxxx> wrote: > From: Macpaul Lin <macpaul@xxxxxxxxx> > > Copy usb_otg_descriptor from config's descriptor if host requests > USB_DT_OTG. > > Signed-off-by: Macpaul Lin <macpaul@xxxxxxxxx> > Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx> Reviewed-by: Roger Quadros <rogerq@xxxxxx> cheers, -roger > --- > drivers/usb/gadget/composite.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c > index 4e3447b..8322e80 100644 > --- a/drivers/usb/gadget/composite.c > +++ b/drivers/usb/gadget/composite.c > @@ -1534,6 +1534,31 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) > value = min(w_length, (u16) value); > } > break; > + case USB_DT_OTG: > + if (gadget_is_otg(gadget)) { > + struct usb_configuration *config; > + int otg_desc_len = 0; > + > + if (cdev->config) > + config = cdev->config; > + else > + config = list_first_entry( > + &cdev->configs, > + struct usb_configuration, list); > + if (!config) > + goto done; > + > + if (gadget->otg_rev >= 0x0200) > + otg_desc_len += sizeof( > + struct usb_otg20_descriptor); > + else > + otg_desc_len += sizeof( > + struct usb_otg_descriptor); > + > + value = min_t(int, w_length, otg_desc_len); > + memcpy(req->buf, config->descriptors[0], value); > + } > + break; > } > break; > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html