Patch "USB: cdc-acm: only raise DTR on transitions from B0" has been added to the 3.17-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    USB: cdc-acm: only raise DTR on transitions from B0

to the 3.17-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     usb-cdc-acm-only-raise-dtr-on-transitions-from-b0.patch
and it can be found in the queue-3.17 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 4473d054ceb572557954f9536731d39b20937b0c Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan@xxxxxxxxxx>
Date: Wed, 5 Nov 2014 18:41:59 +0100
Subject: USB: cdc-acm: only raise DTR on transitions from B0

From: Johan Hovold <johan@xxxxxxxxxx>

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@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
 drivers/usb/class/cdc-acm.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -980,11 +980,12 @@ static void acm_tty_set_termios(struct t
 	/* 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);


Patches currently in stable-queue which might be from johan@xxxxxxxxxx are

queue-3.17/usb-option-add-haier-ce81b-cdma-modem.patch
queue-3.17/usb-cdc-acm-add-quirk-for-control-line-state-requests.patch
queue-3.17/usb-cdc-acm-add-device-id-for-gw-instek-afg-2225.patch
queue-3.17/usb-option-add-support-for-telit-le910.patch
queue-3.17/usb-serial-ftdi_sio-add-awinda-station-and-dongle-products.patch
queue-3.17/usb-serial-cp210x-add-silicon-labs-358x-vid-and-pid.patch
queue-3.17/usb-cdc-acm-only-raise-dtr-on-transitions-from-b0.patch
queue-3.17/usb-serial-ftdi_sio-add-bricked-ftdi-device-pid.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]