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

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

diff --git a/kernel/drivers/usb/gadget/legacy/audio.c b/kernel/drivers/usb/gadget/legacy/audio.c
index f289caf..685cf3b 100644 (file)
--- a/kernel/drivers/usb/gadget/legacy/audio.c
+++ b/kernel/drivers/usb/gadget/legacy/audio.c
@@ -15,7 +15,6 @@
 #include <linux/module.h>
 #include <linux/usb/composite.h>
 
-#include "gadget_chips.h"
 #define DRIVER_DESC            "Linux USB Audio Gadget"
 #define DRIVER_VERSION         "Feb 2, 2012"
 
@@ -124,7 +123,7 @@ static struct usb_device_descriptor device_desc = {
        .bLength =              sizeof device_desc,
        .bDescriptorType =      USB_DT_DEVICE,
 
-       .bcdUSB =               __constant_cpu_to_le16(0x200),
+       .bcdUSB =               cpu_to_le16(0x200),
 
 #ifdef CONFIG_GADGET_UAC1
        .bDeviceClass =         USB_CLASS_PER_INTERFACE,
@@ -141,8 +140,8 @@ static struct usb_device_descriptor device_desc = {
         * we support.  (As does bNumConfigurations.)  These values can
         * also be overridden by module parameters.
         */
-       .idVendor =             __constant_cpu_to_le16(AUDIO_VENDOR_NUM),
-       .idProduct =            __constant_cpu_to_le16(AUDIO_PRODUCT_NUM),
+       .idVendor =             cpu_to_le16(AUDIO_VENDOR_NUM),
+       .idProduct =            cpu_to_le16(AUDIO_PRODUCT_NUM),
        /* .bcdDevice = f(hardware) */
        /* .iManufacturer = DYNAMIC */
        /* .iProduct = DYNAMIC */
@@ -150,20 +149,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];
 
 /*-------------------------------------------------------------------------*/
 
@@ -259,14 +245,28 @@ static int audio_bind(struct usb_composite_dev *cdev)
        device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;
        device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
 
+       if (gadget_is_otg(cdev->gadget) && !otg_desc[0]) {
+               struct usb_descriptor_header *usb_desc;
+
+               usb_desc = usb_otg_descriptor_alloc(cdev->gadget);
+               if (!usb_desc)
+                       goto fail;
+               usb_otg_descriptor_init(cdev->gadget, usb_desc);
+               otg_desc[0] = usb_desc;
+               otg_desc[1] = NULL;
+       }
+
        status = usb_add_config(cdev, &audio_config_driver, audio_do_config);
        if (status < 0)
-               goto fail;
+               goto fail_otg_desc;
        usb_composite_overwrite_options(cdev, &coverwrite);
 
        INFO(cdev, "%s, version: %s\n", DRIVER_DESC, DRIVER_VERSION);
        return 0;
 
+fail_otg_desc:
+       kfree(otg_desc[0]);
+       otg_desc[0] = NULL;
 fail:
 #ifndef CONFIG_GADGET_UAC1
        usb_put_function_instance(fi_uac2);
@@ -289,6 +289,9 @@ static int audio_unbind(struct usb_composite_dev *cdev)
        if (!IS_ERR_OR_NULL(fi_uac2))
                usb_put_function_instance(fi_uac2);
 #endif
+       kfree(otg_desc[0]);
+       otg_desc[0] = NULL;
+
        return 0;
 }