These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / gadget / legacy / serial.c

diff --git a/kernel/drivers/usb/gadget/legacy/serial.c b/kernel/drivers/usb/gadget/legacy/serial.c
index 8b7528f..c5d42e0 100644 (file)
--- a/kernel/drivers/usb/gadget/legacy/serial.c
+++ b/kernel/drivers/usb/gadget/legacy/serial.c
@@ -17,7 +17,6 @@
 #include <linux/tty_flip.h>
 
 #include "u_serial.h"
-#include "gadget_chips.h"
 
 
 /* Defines */
@@ -79,20 +78,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];
 
 /*-------------------------------------------------------------------------*/
 
@@ -191,6 +177,18 @@ static int gs_bind(struct usb_composite_dev *cdev)
        serial_config_driver.iConfiguration = status;
 
        if (gadget_is_otg(cdev->gadget)) {
+               if (!otg_desc[0]) {
+                       struct usb_descriptor_header *usb_desc;
+
+                       usb_desc = usb_otg_descriptor_alloc(cdev->gadget);
+                       if (!usb_desc) {
+                               status = -ENOMEM;
+                               goto fail;
+                       }
+                       usb_otg_descriptor_init(cdev->gadget, usb_desc);
+                       otg_desc[0] = usb_desc;
+                       otg_desc[1] = NULL;
+               }
                serial_config_driver.descriptors = otg_desc;
                serial_config_driver.bmAttributes |= USB_CONFIG_ATT_WAKEUP;
        }
@@ -208,13 +206,15 @@ static int gs_bind(struct usb_composite_dev *cdev)
                                "gser");
        }
        if (status < 0)
-               goto fail;
+               goto fail1;
 
        usb_composite_overwrite_options(cdev, &coverwrite);
        INFO(cdev, "%s\n", GS_VERSION_NAME);
 
        return 0;
-
+fail1:
+       kfree(otg_desc[0]);
+       otg_desc[0] = NULL;
 fail:
        return status;
 }
@@ -227,6 +227,10 @@ static int gs_unbind(struct usb_composite_dev *cdev)
                usb_put_function(f_serial[i]);
                usb_put_function_instance(fi_serial[i]);
        }
+
+       kfree(otg_desc[0]);
+       otg_desc[0] = NULL;
+
        return 0;
 }