diff options
| author | Andrey Gostev <fga022c@motorola.com> | 2014-03-27 18:37:51 -0400 |
|---|---|---|
| committer | Andrey Gostev <fga022c@motorola.com> | 2014-03-27 18:37:51 -0400 |
| commit | 6595bc9f63be7d82983801a398d1a924e81583c4 (patch) | |
| tree | 5e85911c7498e9f41815ae2034d898993c815d95 /drivers/tty/serial/omap-serial.c | |
| parent | 96cf3a08d5d0ea10d2cf7b3aff129fab017c20a0 (diff) | |
| download | olio-linux-3.10-6595bc9f63be7d82983801a398d1a924e81583c4.tar.xz olio-linux-3.10-6595bc9f63be7d82983801a398d1a924e81583c4.zip | |
Revert "IKXCLOCK-550 Bluetooth UART flow control doesn't work (tmp hack)"
This reverts commit 4b27a5742509c8efc6030569ddf32bf189f0b261.
Diffstat (limited to 'drivers/tty/serial/omap-serial.c')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 69515758896..948a2e993c3 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -943,9 +943,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG); - if ((up->port.line == 1 && termios->c_cflag & CRTSCTS) || - (termios->c_cflag & CRTSCTS && - up->port.flags & UPF_HARD_FLOW)) { + if (termios->c_cflag & CRTSCTS && up->port.flags & UPF_HARD_FLOW) { /* Enable AUTORTS and AUTOCTS */ up->efr |= UART_EFR_CTS | UART_EFR_RTS; |