diff options
Diffstat (limited to 'drivers/usb/gadget/printer.c')
-rw-r--r-- | drivers/usb/gadget/printer.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c index 3321a9df4862..9bd994203d3d 100644 --- a/drivers/usb/gadget/printer.c +++ b/drivers/usb/gadget/printer.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
23 | #include <linux/list.h> | 23 | #include <linux/list.h> |
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/utsname.h> | ||
26 | #include <linux/device.h> | 25 | #include <linux/device.h> |
27 | #include <linux/moduleparam.h> | 26 | #include <linux/moduleparam.h> |
28 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
@@ -237,7 +236,6 @@ static const struct usb_descriptor_header *otg_desc[] = { | |||
237 | 236 | ||
238 | /* descriptors that are built on-demand */ | 237 | /* descriptors that are built on-demand */ |
239 | 238 | ||
240 | static char manufacturer [50]; | ||
241 | static char product_desc [40] = DRIVER_DESC; | 239 | static char product_desc [40] = DRIVER_DESC; |
242 | static char serial_num [40] = "1"; | 240 | static char serial_num [40] = "1"; |
243 | static char pnp_string [1024] = | 241 | static char pnp_string [1024] = |
@@ -245,7 +243,7 @@ static char pnp_string [1024] = | |||
245 | 243 | ||
246 | /* static strings, in UTF-8 */ | 244 | /* static strings, in UTF-8 */ |
247 | static struct usb_string strings [] = { | 245 | static struct usb_string strings [] = { |
248 | [USB_GADGET_MANUFACTURER_IDX].s = manufacturer, | 246 | [USB_GADGET_MANUFACTURER_IDX].s = "", |
249 | [USB_GADGET_PRODUCT_IDX].s = product_desc, | 247 | [USB_GADGET_PRODUCT_IDX].s = product_desc, |
250 | [USB_GADGET_SERIAL_IDX].s = serial_num, | 248 | [USB_GADGET_SERIAL_IDX].s = serial_num, |
251 | { } /* end of list */ | 249 | { } /* end of list */ |
@@ -1165,10 +1163,6 @@ static int __init printer_bind_config(struct usb_configuration *c) | |||
1165 | device_desc.bcdDevice = | 1163 | device_desc.bcdDevice = |
1166 | cpu_to_le16(0xFFFF); | 1164 | cpu_to_le16(0xFFFF); |
1167 | } | 1165 | } |
1168 | snprintf(manufacturer, sizeof(manufacturer), "%s %s with %s", | ||
1169 | init_utsname()->sysname, init_utsname()->release, | ||
1170 | gadget->name); | ||
1171 | |||
1172 | if (iPNPstring) | 1166 | if (iPNPstring) |
1173 | strlcpy(&pnp_string[2], iPNPstring, (sizeof pnp_string)-2); | 1167 | strlcpy(&pnp_string[2], iPNPstring, (sizeof pnp_string)-2); |
1174 | 1168 | ||