Merge master.kernel.org:/home/rmk/linux-2.6-serial

ed28f96a · Linus Torvalds · 1480d0a3 · a2436b22 · ed28f96a
Commit ed28f96a authored Oct 30, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/serial/serial_core.c drivers/serial/serial_core.c +1 -2

No files found.
--- 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;