[PATCH v3 12/22] usb: gadget: acm_ms: init usb_otg_descriptor via usb_otg_descriptor_add

[Li Jun]

Use usb_otg_descriptor_add to allocate and initialize usb_otg_descriptor,
free it while composite unbind.

Signed-off-by: Li Jun <jun...@freescale.com>
---
 drivers/usb/gadget/legacy/acm_ms.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/gadget/legacy/acm_ms.c 
b/drivers/usb/gadget/legacy/acm_ms.c
index 1194b09..e10e19e 100644
--- a/drivers/usb/gadget/legacy/acm_ms.c
+++ b/drivers/usb/gadget/legacy/acm_ms.c
@@ -58,21 +58,7 @@ static struct usb_device_descriptor device_desc = {
        /*.bNumConfigurations = DYNAMIC*/
 };
 
-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[] = {
@@ -127,6 +113,21 @@ static int acm_ms_do_config(struct usb_configuration *c)
        int     status;
 
        if (gadget_is_otg(c->cdev->gadget)) {
+               if (!otg_desc[0]) {
+                       struct usb_descriptor_header *usb_desc;
+                       unsigned length;
+
+                       if (c->cdev->gadget->otg_rev >= 0x0200)
+                               length = sizeof(struct usb_otg20_descriptor);
+                       else
+                               length = sizeof(struct usb_otg_descriptor);
+                       usb_desc = kzalloc(length, GFP_KERNEL);
+                       if (!usb_desc)
+                               return -ENOMEM;
+                       usb_otg_descriptor_init(c->cdev->gadget, usb_desc);
+                       otg_desc[0] = usb_desc;
+                       otg_desc[1] = NULL;
+               }
                c->descriptors = otg_desc;
                c->bmAttributes |= USB_CONFIG_ATT_WAKEUP;
        }
@@ -255,6 +256,9 @@ static int acm_ms_unbind(struct usb_composite_dev *cdev)
        usb_put_function_instance(fi_msg);
        usb_put_function(f_acm);
        usb_put_function_instance(f_acm_inst);
+       kfree(otg_desc[0]);
+       otg_desc[0] = NULL;
+
        return 0;
 }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html