diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-06-26 16:47:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-23 16:28:22 -0700 |
| commit | 3177130fd7827fcf792036eaa54d12156172ed5f (patch) | |
| tree | 987ba366a91b496b9888ed3125e1e88d34ba4723 /drivers/usb/serial/ftdi_sio.c | |
| parent | be0278ccf3c05e7048cc6c7906e41bba0b41b8c7 (diff) | |
| download | blackbird-op-linux-3177130fd7827fcf792036eaa54d12156172ed5f.tar.gz blackbird-op-linux-3177130fd7827fcf792036eaa54d12156172ed5f.zip | |
USB: ftdi_sio: remove redundant raise of DTR/RTS at open
Do not raise DTR/RTS a second time in set_termios at open -- this has
already been taken care of by the tty layer.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
| -rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index abcaeafa525f..86f6dfe87f86 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c @@ -2187,7 +2187,7 @@ no_data_parity_stop_changes: dev_err(ddev, "%s urb failed to set baudrate\n", __func__); mutex_unlock(&priv->cfg_lock); /* Ensure RTS and DTR are raised when baudrate changed from 0 */ - if (!old_termios || (old_termios->c_cflag & CBAUD) == B0) + if (old_termios && (old_termios->c_cflag & CBAUD) == B0) set_mctrl(port, TIOCM_DTR | TIOCM_RTS); } |
