From 06f4027383480504851f51ee0673b79fddc65ca9 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 17 Apr 2012 16:41:10 +0100 Subject: [PATCH] --- yaml --- r: 339161 b: refs/heads/master c: dba05832cbe4f305dfd998fb26d7c685d91fbbd8 h: refs/heads/master i: 339159: 4aebf3066ce5d0cff6ec589d6830edf0c7fa0bb2 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 7 +++++++ trunk/include/linux/serial_core.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f1cb6e409e59..f5023b86025c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cbacafd7af0f1cc7a433668c662a91ba6aabc1b +refs/heads/master: dba05832cbe4f305dfd998fb26d7c685d91fbbd8 diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index bd10bbd56446..9d8796e77188 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -1255,6 +1255,13 @@ static void uart_set_termios(struct tty_struct *tty, uart_set_mctrl(uport, mask); } + /* + * If the port is doing h/w assisted flow control, do nothing. + * We assume that tty->hw_stopped has never been set. + */ + if (uport->flags & UPF_HARD_FLOW) + return; + /* Handle turning off CRTSCTS */ if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) { spin_lock_irqsave(&uport->lock, flags); diff --git a/trunk/include/linux/serial_core.h b/trunk/include/linux/serial_core.h index 00051388de3c..e2cda5d04e48 100644 --- a/trunk/include/linux/serial_core.h +++ b/trunk/include/linux/serial_core.h @@ -163,6 +163,8 @@ struct uart_port { #define UPF_BUGGY_UART ((__force upf_t) (1 << 14)) #define UPF_NO_TXEN_TEST ((__force upf_t) (1 << 15)) #define UPF_MAGIC_MULTIPLIER ((__force upf_t) (1 << 16)) +/* Port has hardware-assisted h/w flow control (iow, auto-RTS *not* auto-CTS) */ +#define UPF_HARD_FLOW ((__force upf_t) (1 << 21)) /* Port has hardware-assisted s/w flow control */ #define UPF_SOFT_FLOW ((__force upf_t) (1 << 22)) #define UPF_CONS_FLOW ((__force upf_t) (1 << 23))