Commit 7fcd1238 authored by Daniel Mack's avatar Daniel Mack Committed by Greg Kroah-Hartman

USB: ftdi_sio: fix DTR/RTS line modes

commit 6a1a82df upstream.

Call set_mctrl() and clear_mctrl() according to the flow control mode
selected. This makes serial communication for FT232 connected devices
work when CRTSCTS is not set.

This fixes a regression introduced by 4175f3e3 ("tty_port: If we are
opened non blocking we still need to raise the carrier"). This patch
calls the low-level driver's dtr_rts() function which consequently sets
TIOCM_DTR | TIOCM_RTS. A later call to set_termios() without CRTSCTS in
cflags, however, does not reset these bits, and so data is not actually
sent out on the serial wire.
Signed-off-by: default avatarDaniel Mack <daniel@caiaq.de>
Cc: Johan Hovold <jhovold@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2e6aac90
...@@ -2289,6 +2289,8 @@ static void ftdi_set_termios(struct tty_struct *tty, ...@@ -2289,6 +2289,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
"urb failed to set to rts/cts flow control\n"); "urb failed to set to rts/cts flow control\n");
} }
/* raise DTR/RTS */
set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
} else { } else {
/* /*
* Xon/Xoff code * Xon/Xoff code
...@@ -2336,6 +2338,8 @@ static void ftdi_set_termios(struct tty_struct *tty, ...@@ -2336,6 +2338,8 @@ static void ftdi_set_termios(struct tty_struct *tty,
} }
} }
/* lower DTR/RTS */
clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
} }
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment