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

diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 2d8622eef7019caffee46cfe2949898e8d7174b0..401d94a7fe2ee541ad9701edb88378ad5eccb54b 100644 (file)
--- 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;