Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[u-boot] / drivers / usb / gadget / g_dnl.c

diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c
index 3cb7302b59031355b829cbfc5ee27c216891ba11..a3e05a872a7bdd157ddcad653a32cc9f97f391d5 100644 (file)
--- a/drivers/usb/gadget/g_dnl.c
+++ b/drivers/usb/gadget/g_dnl.c
@@ -56,11 +56,14 @@ static struct usb_device_descriptor device_desc = {
        .bNumConfigurations = 1,
 };
 
-/* static strings, in UTF-8 */
+/*
+ * static strings, in UTF-8
+ * IDs for those strings are assigned dynamically at g_dnl_bind()
+ */
 static struct usb_string g_dnl_string_defs[] = {
-       { 0, manufacturer, },
-       { 1, product, },
-       {  }            /* end of list */
+       {.s = manufacturer},
+       {.s = product},
+       { }             /* end of list */
 };
 
 static struct usb_gadget_strings g_dnl_string_tab = {