summaryrefslogtreecommitdiffstats
path: root/drivers/char/mxser.c
diff options
context:
space:
mode:
authorJiri Slaby2009-12-09 21:34:15 +0100
committerGreg Kroah-Hartman2010-03-02 23:43:12 +0100
commitf43a510de8af5748637de21c96f82232b24920e4 (patch)
tree4b1bfa5c1bfbe79edea7ee3a50ef225de4a85972 /drivers/char/mxser.c
parentserial: cyclades: allow overriding ISA defaults also when the driver is built-in (diff)
downloadkernel-qcow2-linux-f43a510de8af5748637de21c96f82232b24920e4.tar.gz
kernel-qcow2-linux-f43a510de8af5748637de21c96f82232b24920e4.tar.xz
kernel-qcow2-linux-f43a510de8af5748637de21c96f82232b24920e4.zip
tty: char: mxser, remove unnecessary tty test
Stanse found unnecessary test in mxser_startup. tty is dereferenced earlier, the test is superfluous. Remove it. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/mxser.c')
-rw-r--r--drivers/char/mxser.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 3d923065d9a2..e0c5d2a69046 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -895,8 +895,7 @@ static int mxser_activate(struct tty_port *port, struct tty_struct *tty)
if (inb(info->ioaddr + UART_LSR) == 0xff) {
spin_unlock_irqrestore(&info->slock, flags);
if (capable(CAP_SYS_ADMIN)) {
- if (tty)
- set_bit(TTY_IO_ERROR, &tty->flags);
+ set_bit(TTY_IO_ERROR, &tty->flags);
return 0;
} else
return -ENODEV;