usb: gadget: make sure each gadget is using same index for Product, Serial,…

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / gadget / cdc2.c

diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c
index 93a75809b4deb4118c436c42434126e47c4c9a06..8966bdec15349469a11a70aaaa080ab3f820934d 100644 (file)
--- a/drivers/usb/gadget/cdc2.c
+++ b/drivers/usb/gadget/cdc2.c
@@ -90,15 +90,12 @@ static const struct usb_descriptor_header *otg_desc[] = {
 
 
 /* string IDs are assigned dynamically */
-
-#define STRING_MANUFACTURER_IDX                0
-#define STRING_PRODUCT_IDX             1
-
 static char manufacturer[50];
 
 static struct usb_string strings_dev[] = {
-       [STRING_MANUFACTURER_IDX].s = manufacturer,
-       [STRING_PRODUCT_IDX].s = DRIVER_DESC,
+       [USB_GADGET_MANUFACTURER_IDX].s = manufacturer,
+       [USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC,
+       [USB_GADGET_SERIAL_IDX].s = "",
        {  } /* end of list */
 };
 
@@ -197,8 +194,8 @@ static int __init cdc_bind(struct usb_composite_dev *cdev)
        status = usb_string_ids_tab(cdev, strings_dev);
        if (status < 0)
                goto fail1;
-       device_desc.iManufacturer = strings_dev[STRING_MANUFACTURER_IDX].id;
-       device_desc.iProduct = strings_dev[STRING_PRODUCT_IDX].id;
+       device_desc.iManufacturer = strings_dev[USB_GADGET_MANUFACTURER_IDX].id;
+       device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id;
 
        /* register our configuration */
        status = usb_add_config(cdev, &cdc_config_driver, cdc_do_config);