Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41241
b: refs/heads/master
c: 5d7efe5
h: refs/heads/master
i:
  41239: 466d8d3
v: v3
  • Loading branch information
Eric Sesterhenn authored and Greg Kroah-Hartman committed Dec 1, 2006
1 parent 98620db commit 0f13be2
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 052ac01aeb84d8427ba8ac3d70991ac01b009b59
refs/heads/master: 5d7efe5b3768bf53df9b87380ea68baacf11f933
10 changes: 3 additions & 7 deletions trunk/drivers/usb/atm/ueagle-atm.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,8 @@ static int uea_send_modem_cmd(struct usb_device *usb,
int ret = -ENOMEM;
u8 *xfer_buff;

xfer_buff = kmalloc(size, GFP_KERNEL);
xfer_buff = kmemdup(buff, size, GFP_KERNEL);
if (xfer_buff) {
memcpy(xfer_buff, buff, size);
ret = usb_control_msg(usb,
usb_sndctrlpipe(usb, 0),
LOAD_INTERNAL,
Expand Down Expand Up @@ -595,14 +594,12 @@ static int uea_idma_write(struct uea_softc *sc, void *data, u32 size)
u8 *xfer_buff;
int bytes_read;

xfer_buff = kmalloc(size, GFP_KERNEL);
xfer_buff = kmemdup(data, size, GFP_KERNEL);
if (!xfer_buff) {
uea_err(INS_TO_USBDEV(sc), "can't allocate xfer_buff\n");
return ret;
}

memcpy(xfer_buff, data, size);

ret = usb_bulk_msg(sc->usb_dev,
usb_sndbulkpipe(sc->usb_dev, UEA_IDMA_PIPE),
xfer_buff, size, &bytes_read, BULK_TIMEOUT);
Expand Down Expand Up @@ -765,12 +762,11 @@ static int uea_request(struct uea_softc *sc,
u8 *xfer_buff;
int ret = -ENOMEM;

xfer_buff = kmalloc(size, GFP_KERNEL);
xfer_buff = kmemdup(data, size, GFP_KERNEL);
if (!xfer_buff) {
uea_err(INS_TO_USBDEV(sc), "can't allocate xfer_buff\n");
return ret;
}
memcpy(xfer_buff, data, size);

ret = usb_control_msg(sc->usb_dev, usb_sndctrlpipe(sc->usb_dev, 0),
UCDC_SEND_ENCAPSULATED_COMMAND,
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/usb/misc/emi26.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,12 @@ static void __exit emi26_exit (void);
static int emi26_writememory (struct usb_device *dev, int address, unsigned char *data, int length, __u8 request)
{
int result;
unsigned char *buffer = kmalloc (length, GFP_KERNEL);
unsigned char *buffer = kmemdup(data, length, GFP_KERNEL);

if (!buffer) {
err("emi26: kmalloc(%d) failed.", length);
return -ENOMEM;
}
memcpy (buffer, data, length);
/* Note: usb_control_msg returns negative value on error or length of the
* data that was written! */
result = usb_control_msg (dev, usb_sndctrlpipe(dev, 0), request, 0x40, address, 0, buffer, length, 300);
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/usb/misc/emi62.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,12 @@ static void __exit emi62_exit (void);
static int emi62_writememory (struct usb_device *dev, int address, unsigned char *data, int length, __u8 request)
{
int result;
unsigned char *buffer = kmalloc (length, GFP_KERNEL);
unsigned char *buffer = kmemdup(data, length, GFP_KERNEL);

if (!buffer) {
err("emi62: kmalloc(%d) failed.", length);
return -ENOMEM;
}
memcpy (buffer, data, length);
/* Note: usb_control_msg returns negative value on error or length of the
* data that was written! */
result = usb_control_msg (dev, usb_sndctrlpipe(dev, 0), request, 0x40, address, 0, buffer, length, 300);
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/usb/serial/ezusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da
return -ENODEV;
}

transfer_buffer = kmalloc (length, GFP_KERNEL);
transfer_buffer = kmemdup(data, length, GFP_KERNEL);
if (!transfer_buffer) {
dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, length);
return -ENOMEM;
}
memcpy (transfer_buffer, data, length);
result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000);
kfree (transfer_buffer);
return result;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/usb/serial/ipw.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,9 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)

dbg("%s", __FUNCTION__);

buf_flow_init = kmalloc(16, GFP_KERNEL);
buf_flow_init = kmemdup(buf_flow_static, 16, GFP_KERNEL);
if (!buf_flow_init)
return -ENOMEM;
memcpy(buf_flow_init, buf_flow_static, 16);

if (port->tty)
port->tty->low_latency = 1;
Expand Down

0 comments on commit 0f13be2

Please sign in to comment.