summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-06-26 16:47:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-24 01:21:50 +0200
commita0b9281e29fb8942baddf2ce4067eb611f4f9c01 (patch)
tree72fc6c91ba36f532eecea29a8a645162aae58398 /drivers/usb
parentUSB: misc: remove CONFIG_USB_DEBUG from Makefile (diff)
downloadlinux-a0b9281e29fb8942baddf2ce4067eb611f4f9c01.tar.xz
linux-a0b9281e29fb8942baddf2ce4067eb611f4f9c01.zip
USB: serial: remove defensive test from set_termios
Remove defensive test from set_termios which is never called with a NULL tty. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/cp210x.c3
-rw-r--r--drivers/usb/serial/oti6858.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index d6ef2f8da37d..5627058964d5 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -666,9 +666,6 @@ static void cp210x_set_termios(struct tty_struct *tty,
unsigned int bits;
unsigned int modem_ctl[4];
- if (!tty)
- return;
-
cflag = tty->termios.c_cflag;
old_cflag = old_termios->c_cflag;
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 7e3e0782e51f..cf509c8c1aa1 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -411,9 +411,6 @@ static void oti6858_set_termios(struct tty_struct *tty,
__le16 divisor;
int br;
- if (!tty)
- return;
-
cflag = tty->termios.c_cflag;
spin_lock_irqsave(&priv->lock, flags);