summary refs log tree commit diff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:48:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:48:37 -0800
commited28f96ac1960f30f818374d65be71d2fdf811b0 (patch)
tree7229e77dbd27eee1378d1317c63c272dbe57cac0
parent1480d0a31db62b9803f829cc0e5cc71935ffe3cc (diff)
parenta2436b22deac7834e0f87897b207a2dc1407dc40 (diff)
downloadlinux-ed28f96ac1960f30f818374d65be71d2fdf811b0.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-serial
-rw-r--r--drivers/serial/serial_core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 2d8622eef701..401d94a7fe2e 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -147,8 +147,7 @@ static int uart_startup(struct uart_state *state, int init_hw)
 	 * once we have successfully opened the port.  Also set
 	 * up the tty->alt_speed kludge
 	 */
-	if (info->tty)
-		set_bit(TTY_IO_ERROR, &info->tty->flags);
+	set_bit(TTY_IO_ERROR, &info->tty->flags);
 
 	if (port->type == PORT_UNKNOWN)
 		return 0;