From 87b43c0f4a1602ff1095523424926bbe6b946556 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Mon, 25 Jan 2010 14:53:33 +0300
Subject: [PATCH] --- yaml --- r: 185377 b: refs/heads/master c:
 f10718f5b812a2c55e37396518d426f88d5e35fc h: refs/heads/master i:   185375:
 2b4f3bd5f49d4928776432d43f9b07dc1530eee2 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/usb/serial/io_edgeport.c | 43 +++-----------------------
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/[refs] b/[refs]
index 6f44dc1d9152..6153e76ab58a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b520259ab6d661b8d5eb39dd17cc5e4e4553c62
+refs/heads/master: f10718f5b812a2c55e37396518d426f88d5e35fc
diff --git a/trunk/drivers/usb/serial/io_edgeport.c b/trunk/drivers/usb/serial/io_edgeport.c
index 09456002bac0..c055c8ba377d 100644
--- a/trunk/drivers/usb/serial/io_edgeport.c
+++ b/trunk/drivers/usb/serial/io_edgeport.c
@@ -364,43 +364,6 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial)
 	release_firmware(fw);
 }
 
-
-/************************************************************************
- *									*
- *  Get string descriptor from device					*
- *									*
- ************************************************************************/
-static int get_string(struct usb_device *dev, int Id, char *string, int buflen)
-{
-	struct usb_string_descriptor *StringDesc = NULL;
-	struct usb_string_descriptor *pStringDesc = NULL;
-	int ret = 0;
-
-	dbg("%s - USB String ID = %d", __func__, Id);
-
-	StringDesc = kmalloc(sizeof(*StringDesc), GFP_KERNEL);
-	if (!StringDesc)
-		goto free;
-	if (usb_get_descriptor(dev, USB_DT_STRING, Id, StringDesc, sizeof(*StringDesc)) <= 0)
-		goto free;
-
-	pStringDesc = kmalloc(StringDesc->bLength, GFP_KERNEL);
-	if (!pStringDesc)
-		goto free;
-
-	if (usb_get_descriptor(dev, USB_DT_STRING, Id, pStringDesc, StringDesc->bLength) <= 0)
-		goto free;
-
-	unicode_to_ascii(string, buflen, pStringDesc->wData, pStringDesc->bLength/2);
-	ret = strlen(string);
-	dbg("%s - USB String %s", __func__, string);
-free:
-	kfree(StringDesc);
-	kfree(pStringDesc);
-	return ret;
-}
-
-
 #if 0
 /************************************************************************
  *
@@ -2998,10 +2961,12 @@ static int edge_startup(struct usb_serial *serial)
 	usb_set_serial_data(serial, edge_serial);
 
 	/* get the name for the device from the device */
-	i = get_string(dev, dev->descriptor.iManufacturer,
+	i = usb_string(dev, dev->descriptor.iManufacturer,
 	    &edge_serial->name[0], MAX_NAME_LEN+1);
+	if (i < 0)
+		i = 0;
 	edge_serial->name[i++] = ' ';
-	get_string(dev, dev->descriptor.iProduct,
+	usb_string(dev, dev->descriptor.iProduct,
 	    &edge_serial->name[i], MAX_NAME_LEN+2 - i);
 
 	dev_info(&serial->dev->dev, "%s detected\n", edge_serial->name);