lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: io_edgeport: eliminate get_string()

Browse Source 
Johan Hovold points out that get_string() is basically just a
re-implimentation of usb_string().  It is also buggy.  It does DMA on
the stack and it doesn't handle negative returns from
usb_get_descriptor().  Plus unicode_to_ascii() is a rubbish function and
moving to usb_string() avoids using it.

Let's eliminate get_string() entirely.

Reported-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dan Carpenter
2010-01-25 14:53:33 +03:00
committed by Greg Kroah-Hartman
parent 5b520259ab
commit f10718f5b8
1 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/usb/serial/io_edgeport.c
View File

@@ -364,43 +364,6 @@ static void update_edgeport_E2PROM(struct edgeport_serial *edge_serial)
release_firmware(fw); 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 #if 0
/************************************************************************ /************************************************************************
* *
@@ -2998,10 +2961,12 @@ static int edge_startup(struct usb_serial *serial)
usb_set_serial_data(serial, edge_serial); usb_set_serial_data(serial, edge_serial);
/* get the name for the device from the device */ /* 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); &edge_serial->name[0], MAX_NAME_LEN+1);
if (i < 0)
i = 0;
edge_serial->name[i++] = ' '; 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); &edge_serial->name[i], MAX_NAME_LEN+2 - i);
dev_info(&serial->dev->dev, "%s detected\n", edge_serial->name); dev_info(&serial->dev->dev, "%s detected\n", edge_serial->name);