diff options
author | Alan Cox <alan@linux.intel.com> | 2009-06-11 08:57:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 11:51:06 -0400 |
commit | 7e9cd3a617414cfe74342659ceeb4e92975c1efa (patch) | |
tree | e2c854c6df15d58c30a65768d68380eacfd97ba5 /drivers | |
parent | 7f8d09eae26a8108406583192996561665b36371 (diff) |
ftdi_sio: don't override modem bits
The new open/close logic handles DTR and friends, so don't do it in our own
open routine as well.
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 21c053c31b9e..683304d60615 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -1556,11 +1556,6 @@ static int ftdi_open(struct tty_struct *tty, | |||
1556 | if (tty) | 1556 | if (tty) |
1557 | ftdi_set_termios(tty, port, tty->termios); | 1557 | ftdi_set_termios(tty, port, tty->termios); |
1558 | 1558 | ||
1559 | /* FIXME: Flow control might be enabled, so it should be checked - | ||
1560 | we have no control of defaults! */ | ||
1561 | /* Turn on RTS and DTR since we are not flow controlling by default */ | ||
1562 | set_mctrl(port, TIOCM_DTR | TIOCM_RTS); | ||
1563 | |||
1564 | /* Not throttled */ | 1559 | /* Not throttled */ |
1565 | spin_lock_irqsave(&priv->rx_lock, flags); | 1560 | spin_lock_irqsave(&priv->rx_lock, flags); |
1566 | priv->rx_flags &= ~(THROTTLED | ACTUALLY_THROTTLED); | 1561 | priv->rx_flags &= ~(THROTTLED | ACTUALLY_THROTTLED); |