diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 15:43:14 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 15:43:14 -0400 |
commit | da192bb50cc9a7fe7d95e048422d51777bad0bba (patch) | |
tree | 560986cb68a747de281f82ca605c7125ccc65c1c /drivers/usb/serial/ftdi_sio.c | |
parent | af9288a707b609cdb1069cfe5bde0d6567c12c31 (diff) | |
parent | 3fd07d3bf0077dcc0f5a33d2eb1938ea050da8da (diff) | |
download | talos-op-linux-da192bb50cc9a7fe7d95e048422d51777bad0bba.tar.gz talos-op-linux-da192bb50cc9a7fe7d95e048422d51777bad0bba.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 4e434cb10bb1..5a8631c8a4a7 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -1846,10 +1846,12 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct termios *old_ } else { /* set the baudrate determined before */ if (change_speed(port)) { - err("%s urb failed to set baurdrate", __FUNCTION__); + err("%s urb failed to set baudrate", __FUNCTION__); + } + /* Ensure RTS and DTR are raised when baudrate changed from 0 */ + if ((old_termios->c_cflag & CBAUD) == B0) { + set_mctrl(port, TIOCM_DTR | TIOCM_RTS); } - /* Ensure RTS and DTR are raised */ - set_mctrl(port, TIOCM_DTR | TIOCM_RTS); } /* Set flow control */ |