projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: core: Remove unsafe x_char optimization
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
serial
/
serial_core.c
diff --git
a/drivers/tty/serial/serial_core.c
b/drivers/tty/serial/serial_core.c
index bd20cf51e912c326d67f02631b078035d20b15b4..bdc543caf069a6f4a4d1dfa18f7309d44f15e02b 100644
(file)
--- a/
drivers/tty/serial/serial_core.c
+++ b/
drivers/tty/serial/serial_core.c
@@
-647,12
+647,8
@@
static void uart_unthrottle(struct tty_struct *tty)
mask &= ~port->flags;
}
mask &= ~port->flags;
}
- if (mask & UPF_SOFT_FLOW) {
- if (port->x_char)
- port->x_char = 0;
- else
- uart_send_xchar(tty, START_CHAR(tty));
- }
+ if (mask & UPF_SOFT_FLOW)
+ uart_send_xchar(tty, START_CHAR(tty));
if (mask & UPF_HARD_FLOW)
uart_set_mctrl(port, TIOCM_RTS);
if (mask & UPF_HARD_FLOW)
uart_set_mctrl(port, TIOCM_RTS);