From f06360e1cf57ac0920dc0442684559b48795beb3 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 9 Nov 2011 21:33:48 +0100 Subject: [PATCH] --- yaml --- r: 280673 b: refs/heads/master c: b39c49a05ec7322c96ec917922eae8b908d2c76f h: refs/heads/master i: 280671: faa1e5b5231f39667de693de8ff9257b88ff9692 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d754f6f7bf75..6be671117d28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf75525f374dd5c49d705d9c8c3757f9aa3e9fd2 +refs/heads/master: b39c49a05ec7322c96ec917922eae8b908d2c76f diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 036e0ccbd25a..4b1dcd3f2a40 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -141,8 +141,7 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in /* * Set the TTY IO error marker - we will only clear this - * once we have successfully opened the port. Also set - * up the tty->alt_speed kludge + * once we have successfully opened the port. */ set_bit(TTY_IO_ERROR, &tty->flags); @@ -1499,7 +1498,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp) tty->driver_data = state; state->uart_port->state = state; tty->low_latency = (state->uart_port->flags & UPF_LOW_LATENCY) ? 1 : 0; - tty->alt_speed = 0; tty_port_tty_set(port, tty); /*