From d9a8caa6a0fe435d74a10f61241cc1a433ab5e30 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 9 Dec 2009 12:34:15 -0800
Subject: [PATCH] --- yaml --- r: 185185 b: refs/heads/master c:
 f43a510de8af5748637de21c96f82232b24920e4 h: refs/heads/master i:   185183:
 ae274528b3e04a482a2b9a6d13ea85861f8ed536 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/mxser.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index dcf0bdfd9506..3ced4dd140a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2090436357c20afad377a61c789f502c36d637de
+refs/heads/master: f43a510de8af5748637de21c96f82232b24920e4
diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c
index 3d923065d9a2..e0c5d2a69046 100644
--- a/trunk/drivers/char/mxser.c
+++ b/trunk/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;