Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed28f96a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 1480d0a3 a2436b22

drivers/serial/serial_core.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -147,7 +147,6 @@ 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)