diff options
| author | Johan Hovold <johan@kernel.org> | 2014-11-05 18:41:59 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-12-14 16:23:55 +0000 |
| commit | ae11f62aeb3b9cd5222309a48611d475dad974ed (patch) | |
| tree | 38e4e7b146980359431f7c759fd06584fe0abb92 /drivers/usb | |
| parent | b05ff47c7d4144c168553fc297bc25751e9e2525 (diff) | |
| download | kernel_samsung_smdk4412-ae11f62aeb3b9cd5222309a48611d475dad974ed.zip kernel_samsung_smdk4412-ae11f62aeb3b9cd5222309a48611d475dad974ed.tar.gz kernel_samsung_smdk4412-ae11f62aeb3b9cd5222309a48611d475dad974ed.tar.bz2 | |
USB: cdc-acm: only raise DTR on transitions from B0
commit 4473d054ceb572557954f9536731d39b20937b0c upstream.
Make sure to only raise DTR on transitions from B0 in set_termios.
Also allow set_termios to be called from open with a termios_old of
NULL. Note that DTR will not be raised prematurely in this case.
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index e26c6fa..6647081 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -819,11 +819,12 @@ static void acm_tty_set_termios(struct tty_struct *tty, /* FIXME: Needs to clear unsupported bits in the termios */ acm->clocal = ((termios->c_cflag & CLOCAL) != 0); - if (!newline.dwDTERate) { + if (C_BAUD(tty) == B0) { newline.dwDTERate = acm->line.dwDTERate; newctrl &= ~ACM_CTRL_DTR; - } else + } else if (termios_old && (termios_old->c_cflag & CBAUD) == B0) { newctrl |= ACM_CTRL_DTR; + } if (newctrl != acm->ctrlout) acm_set_control(acm, acm->ctrlout = newctrl); |