diff options
Diffstat (limited to 'drivers/usb/gadget/cdc2.c')
-rw-r--r-- | drivers/usb/gadget/cdc2.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/usb/gadget/cdc2.c b/drivers/usb/gadget/cdc2.c index 8966bdec153..4e2060bf35e 100644 --- a/drivers/usb/gadget/cdc2.c +++ b/drivers/usb/gadget/cdc2.c | |||
@@ -11,7 +11,6 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
14 | #include <linux/utsname.h> | ||
15 | #include <linux/module.h> | 14 | #include <linux/module.h> |
16 | 15 | ||
17 | #include "u_ether.h" | 16 | #include "u_ether.h" |
@@ -90,10 +89,8 @@ static const struct usb_descriptor_header *otg_desc[] = { | |||
90 | 89 | ||
91 | 90 | ||
92 | /* string IDs are assigned dynamically */ | 91 | /* string IDs are assigned dynamically */ |
93 | static char manufacturer[50]; | ||
94 | |||
95 | static struct usb_string strings_dev[] = { | 92 | static struct usb_string strings_dev[] = { |
96 | [USB_GADGET_MANUFACTURER_IDX].s = manufacturer, | 93 | [USB_GADGET_MANUFACTURER_IDX].s = "", |
97 | [USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC, | 94 | [USB_GADGET_PRODUCT_IDX].s = DRIVER_DESC, |
98 | [USB_GADGET_SERIAL_IDX].s = "", | 95 | [USB_GADGET_SERIAL_IDX].s = "", |
99 | { } /* end of list */ | 96 | { } /* end of list */ |
@@ -182,15 +179,10 @@ static int __init cdc_bind(struct usb_composite_dev *cdev) | |||
182 | cpu_to_le16(0x0300 | 0x0099); | 179 | cpu_to_le16(0x0300 | 0x0099); |
183 | } | 180 | } |
184 | 181 | ||
185 | |||
186 | /* Allocate string descriptor numbers ... note that string | 182 | /* Allocate string descriptor numbers ... note that string |
187 | * contents can be overridden by the composite_dev glue. | 183 | * contents can be overridden by the composite_dev glue. |
188 | */ | 184 | */ |
189 | 185 | ||
190 | /* device descriptor strings: manufacturer, product */ | ||
191 | snprintf(manufacturer, sizeof manufacturer, "%s %s with %s", | ||
192 | init_utsname()->sysname, init_utsname()->release, | ||
193 | gadget->name); | ||
194 | status = usb_string_ids_tab(cdev, strings_dev); | 186 | status = usb_string_ids_tab(cdev, strings_dev); |
195 | if (status < 0) | 187 | if (status < 0) |
196 | goto fail1; | 188 | goto fail1; |