Commit ed28f96a authored by Linus Torvalds's avatar Linus Torvalds

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

parents 1480d0a3 a2436b22
...@@ -147,8 +147,7 @@ static int uart_startup(struct uart_state *state, int init_hw) ...@@ -147,8 +147,7 @@ static int uart_startup(struct uart_state *state, int init_hw)
* once we have successfully opened the port. Also set * once we have successfully opened the port. Also set
* up the tty->alt_speed kludge * 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) if (port->type == PORT_UNKNOWN)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment