aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/kobil_sct.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2009-12-28 17:01:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:53:57 -0500
commit96679f6bd5e1ccb30671b81636b4fdc326e46d8a (patch)
tree13c17d131362ad70360b128ad5c4c064c812c9a9 /drivers/usb/serial/kobil_sct.c
parent401711cb575bbbdb100bc1a14cb2024dfc9b4869 (diff)
USB: kobil_sct: clean up kobil_set_termios
Kill string that is allocated and generated using speed and parity settings but is never used (and never has been). Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/kobil_sct.c')
-rw-r--r--drivers/usb/serial/kobil_sct.c22
1 files changed, 4 insertions, 18 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 45ea694b3ae..f917c5b09ca 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -624,7 +624,6 @@ static void kobil_set_termios(struct tty_struct *tty,
624 unsigned short urb_val = 0; 624 unsigned short urb_val = 0;
625 int c_cflag = tty->termios->c_cflag; 625 int c_cflag = tty->termios->c_cflag;
626 speed_t speed; 626 speed_t speed;
627 void *settings;
628 627
629 priv = usb_get_serial_port_data(port); 628 priv = usb_get_serial_port_data(port);
630 if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID || 629 if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
@@ -647,25 +646,13 @@ static void kobil_set_termios(struct tty_struct *tty,
647 } 646 }
648 urb_val |= (c_cflag & CSTOPB) ? SUSBCR_SPASB_2StopBits : 647 urb_val |= (c_cflag & CSTOPB) ? SUSBCR_SPASB_2StopBits :
649 SUSBCR_SPASB_1StopBit; 648 SUSBCR_SPASB_1StopBit;
650
651 settings = kzalloc(50, GFP_KERNEL);
652 if (!settings)
653 return;
654
655 sprintf(settings, "%d ", speed);
656
657 if (c_cflag & PARENB) { 649 if (c_cflag & PARENB) {
658 if (c_cflag & PARODD) { 650 if (c_cflag & PARODD)
659 urb_val |= SUSBCR_SPASB_OddParity; 651 urb_val |= SUSBCR_SPASB_OddParity;
660 strcat(settings, "Odd Parity"); 652 else
661 } else {
662 urb_val |= SUSBCR_SPASB_EvenParity; 653 urb_val |= SUSBCR_SPASB_EvenParity;
663 strcat(settings, "Even Parity"); 654 } else
664 }
665 } else {
666 urb_val |= SUSBCR_SPASB_NoParity; 655 urb_val |= SUSBCR_SPASB_NoParity;
667 strcat(settings, "No Parity");
668 }
669 tty->termios->c_cflag &= ~CMSPAR; 656 tty->termios->c_cflag &= ~CMSPAR;
670 tty_encode_baud_rate(tty, speed, speed); 657 tty_encode_baud_rate(tty, speed, speed);
671 658
@@ -675,11 +662,10 @@ static void kobil_set_termios(struct tty_struct *tty,
675 USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT, 662 USB_TYPE_VENDOR | USB_RECIP_ENDPOINT | USB_DIR_OUT,
676 urb_val, 663 urb_val,
677 0, 664 0,
678 settings, 665 NULL,
679 0, 666 0,
680 KOBIL_TIMEOUT 667 KOBIL_TIMEOUT
681 ); 668 );
682 kfree(settings);
683} 669}
684 670
685static int kobil_ioctl(struct tty_struct *tty, struct file *file, 671static int kobil_ioctl(struct tty_struct *tty, struct file *file,