diff options
Diffstat (limited to 'drivers/tty/serial/mux.c')
-rw-r--r-- | drivers/tty/serial/mux.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index e2775b6df5a5..7fd6aaaacd8e 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c | |||
@@ -242,8 +242,8 @@ static void mux_write(struct uart_port *port) | |||
242 | */ | 242 | */ |
243 | static void mux_read(struct uart_port *port) | 243 | static void mux_read(struct uart_port *port) |
244 | { | 244 | { |
245 | struct tty_port *tport = &port->state->port; | ||
245 | int data; | 246 | int data; |
246 | struct tty_struct *tty = port->state->port.tty; | ||
247 | __u32 start_count = port->icount.rx; | 247 | __u32 start_count = port->icount.rx; |
248 | 248 | ||
249 | while(1) { | 249 | while(1) { |
@@ -266,12 +266,11 @@ static void mux_read(struct uart_port *port) | |||
266 | if (uart_handle_sysrq_char(port, data & 0xffu)) | 266 | if (uart_handle_sysrq_char(port, data & 0xffu)) |
267 | continue; | 267 | continue; |
268 | 268 | ||
269 | tty_insert_flip_char(tty, data & 0xFF, TTY_NORMAL); | 269 | tty_insert_flip_char(tport, data & 0xFF, TTY_NORMAL); |
270 | } | 270 | } |
271 | 271 | ||
272 | if (start_count != port->icount.rx) { | 272 | if (start_count != port->icount.rx) |
273 | tty_flip_buffer_push(tty); | 273 | tty_flip_buffer_push(tport); |
274 | } | ||
275 | } | 274 | } |
276 | 275 | ||
277 | /** | 276 | /** |