diff options
Diffstat (limited to 'drivers/usb/serial/kobil_sct.c')
-rw-r--r-- | drivers/usb/serial/kobil_sct.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 078f9ed419c8..3d2bd65df0fc 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
@@ -414,8 +414,6 @@ static int kobil_tiocmset(struct tty_struct *tty, | |||
414 | int result; | 414 | int result; |
415 | int dtr = 0; | 415 | int dtr = 0; |
416 | int rts = 0; | 416 | int rts = 0; |
417 | unsigned char *transfer_buffer; | ||
418 | int transfer_buffer_length = 8; | ||
419 | 417 | ||
420 | /* FIXME: locking ? */ | 418 | /* FIXME: locking ? */ |
421 | priv = usb_get_serial_port_data(port); | 419 | priv = usb_get_serial_port_data(port); |
@@ -425,11 +423,6 @@ static int kobil_tiocmset(struct tty_struct *tty, | |||
425 | return -EINVAL; | 423 | return -EINVAL; |
426 | } | 424 | } |
427 | 425 | ||
428 | /* allocate memory for transfer buffer */ | ||
429 | transfer_buffer = kzalloc(transfer_buffer_length, GFP_KERNEL); | ||
430 | if (!transfer_buffer) | ||
431 | return -ENOMEM; | ||
432 | |||
433 | if (set & TIOCM_RTS) | 426 | if (set & TIOCM_RTS) |
434 | rts = 1; | 427 | rts = 1; |
435 | if (set & TIOCM_DTR) | 428 | if (set & TIOCM_DTR) |
@@ -469,7 +462,6 @@ static int kobil_tiocmset(struct tty_struct *tty, | |||
469 | KOBIL_TIMEOUT); | 462 | KOBIL_TIMEOUT); |
470 | } | 463 | } |
471 | dev_dbg(dev, "%s - Send set_status_line URB returns: %i\n", __func__, result); | 464 | dev_dbg(dev, "%s - Send set_status_line URB returns: %i\n", __func__, result); |
472 | kfree(transfer_buffer); | ||
473 | return (result < 0) ? result : 0; | 465 | return (result < 0) ? result : 0; |
474 | } | 466 | } |
475 | 467 | ||
@@ -530,8 +522,6 @@ static int kobil_ioctl(struct tty_struct *tty, | |||
530 | { | 522 | { |
531 | struct usb_serial_port *port = tty->driver_data; | 523 | struct usb_serial_port *port = tty->driver_data; |
532 | struct kobil_private *priv = usb_get_serial_port_data(port); | 524 | struct kobil_private *priv = usb_get_serial_port_data(port); |
533 | unsigned char *transfer_buffer; | ||
534 | int transfer_buffer_length = 8; | ||
535 | int result; | 525 | int result; |
536 | 526 | ||
537 | if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID || | 527 | if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID || |
@@ -541,10 +531,6 @@ static int kobil_ioctl(struct tty_struct *tty, | |||
541 | 531 | ||
542 | switch (cmd) { | 532 | switch (cmd) { |
543 | case TCFLSH: | 533 | case TCFLSH: |
544 | transfer_buffer = kmalloc(transfer_buffer_length, GFP_KERNEL); | ||
545 | if (!transfer_buffer) | ||
546 | return -ENOBUFS; | ||
547 | |||
548 | result = usb_control_msg(port->serial->dev, | 534 | result = usb_control_msg(port->serial->dev, |
549 | usb_sndctrlpipe(port->serial->dev, 0), | 535 | usb_sndctrlpipe(port->serial->dev, 0), |
550 | SUSBCRequest_Misc, | 536 | SUSBCRequest_Misc, |
@@ -559,7 +545,6 @@ static int kobil_ioctl(struct tty_struct *tty, | |||
559 | dev_dbg(&port->dev, | 545 | dev_dbg(&port->dev, |
560 | "%s - Send reset_all_queues (FLUSH) URB returns: %i\n", | 546 | "%s - Send reset_all_queues (FLUSH) URB returns: %i\n", |
561 | __func__, result); | 547 | __func__, result); |
562 | kfree(transfer_buffer); | ||
563 | return (result < 0) ? -EIO: 0; | 548 | return (result < 0) ? -EIO: 0; |
564 | default: | 549 | default: |
565 | return -ENOIOCTLCMD; | 550 | return -ENOIOCTLCMD; |