Use usb_otg_descriptor_add to allocate and initialize usb_otg_descriptor, free it while composite unbind. Signed-off-by: Li Jun <jun.li@xxxxxxxxxxxxx> --- drivers/usb/gadget/legacy/cdc2.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/usb/gadget/legacy/cdc2.c b/drivers/usb/gadget/legacy/cdc2.c index afd3e37..34141e4 100644 --- a/drivers/usb/gadget/legacy/cdc2.c +++ b/drivers/usb/gadget/legacy/cdc2.c @@ -60,21 +60,7 @@ static struct usb_device_descriptor device_desc = { .bNumConfigurations = 1, }; -static struct usb_otg_descriptor otg_descriptor = { - .bLength = sizeof otg_descriptor, - .bDescriptorType = USB_DT_OTG, - - /* REVISIT SRP-only hardware is possible, although - * it would not be called "OTG" ... - */ - .bmAttributes = USB_OTG_SRP | USB_OTG_HNP, -}; - -static const struct usb_descriptor_header *otg_desc[] = { - (struct usb_descriptor_header *) &otg_descriptor, - NULL, -}; - +static const struct usb_descriptor_header *otg_desc[2]; /* string IDs are assigned dynamically */ static struct usb_string strings_dev[] = { @@ -109,6 +95,13 @@ static int cdc_do_config(struct usb_configuration *c) int status; if (gadget_is_otg(c->cdev->gadget)) { + if (!otg_desc[0]) { + otg_desc[0] = (struct usb_descriptor_header *) + usb_otg_descriptor_add(c->cdev->gadget); + if (!otg_desc[0]) + return -ENOMEM; + otg_desc[1] = NULL; + } c->descriptors = otg_desc; c->bmAttributes |= USB_CONFIG_ATT_WAKEUP; } @@ -219,6 +212,9 @@ static int cdc_unbind(struct usb_composite_dev *cdev) usb_put_function(f_ecm); if (!IS_ERR_OR_NULL(fi_ecm)) usb_put_function_instance(fi_ecm); + kfree(otg_desc[0]); + otg_desc[0] = NULL; + return 0; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html