diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-20 09:12:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-20 09:12:57 -0700 |
| commit | 64c7fea7a61519bc219a47db73f6625db08c3453 (patch) | |
| tree | 0ebee60f13ed09f946a098b9112961d90f0adace | |
| parent | 14ff0dc12ed0f303ca432174d0c5b142a0299172 (diff) | |
| parent | 095ed32dd71f95c4e6ed67b197ed82acb9f82c71 (diff) | |
Merge "serial: msm_serial_hs: Align to HW assisted flow control support"
| -rw-r--r-- | drivers/tty/serial/msm_serial_hs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c index 064494366f01..9a9ea7c62db1 100644 --- a/drivers/tty/serial/msm_serial_hs.c +++ b/drivers/tty/serial/msm_serial_hs.c @@ -3,7 +3,7 @@ * MSM 7k High speed uart driver * * Copyright (c) 2008 Google Inc. - * Copyright (c) 2007-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2007-2019, The Linux Foundation. All rights reserved. * Modified: Nick Pelly <npelly@google.com> * * All source code in this file is licensed under the following license @@ -1185,6 +1185,7 @@ static void msm_hs_set_termios(struct uart_port *uport, data |= EIGHT_BPC; break; } + uport->status &= ~(UPSTAT_AUTOCTS); /* stop bits */ if (c_cflag & CSTOPB) { data |= STOP_BIT_TWO; @@ -1229,6 +1230,7 @@ static void msm_hs_set_termios(struct uart_port *uport, if (c_cflag & CRTSCTS) { data |= UARTDM_MR1_CTS_CTL_BMSK; data |= UARTDM_MR1_RX_RDY_CTL_BMSK; + uport->status |= UPSTAT_AUTOCTS; msm_uport->flow_control = true; } msm_hs_write(uport, UART_DM_MR1, data); |