diff options
| author | Johan Hovold <johan@kernel.org> | 2014-11-05 18:41:59 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:47:58 -0800 |
| commit | 2a18a875f45d56777394323e725ea8be378b068c (patch) | |
| tree | 12044173b728fe8f932a2abc2e1e3d40ee732035 | |
| parent | 1e2dedaa4d57a7aa681a542358dcbada0cf7d896 (diff) | |
| download | linux-3.10-2a18a875f45d56777394323e725ea8be378b068c.tar.gz linux-3.10-2a18a875f45d56777394323e725ea8be378b068c.tar.bz2 linux-3.10-2a18a875f45d56777394323e725ea8be378b068c.zip | |
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>
| -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 537e1d32f92..1e71f918eb9 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -883,11 +883,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); |