From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933857AbaJ2Pey (ORCPT ); Wed, 29 Oct 2014 11:34:54 -0400 Received: from mail-lb0-f180.google.com ([209.85.217.180]:54153 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933329AbaJ2Pex (ORCPT ); Wed, 29 Oct 2014 11:34:53 -0400 From: Johan Hovold To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, Jim Paris , Oliver Neukum , linux-kernel@vger.kernel.org, Peter Hurley , Johan Hovold Subject: [PATCH] USB: cdc-acm: only raise DTR on transitions from B0 Date: Wed, 29 Oct 2014 16:30:40 +0100 Message-Id: <1414596640-28555-1-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.4 In-Reply-To: <20141029150716.GG2265@localhost> References: <20141029150716.GG2265@localhost> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/usb/class/cdc-acm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index e934e19f49f5..7e58bbfd6319 100644 --- 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 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); -- 2.0.4