From patchwork Thu Jul 14 18:49:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Pelly X-Patchwork-Id: 975572 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6EInRFQ011613 for ; Thu, 14 Jul 2011 18:49:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932143Ab1GNSt0 (ORCPT ); Thu, 14 Jul 2011 14:49:26 -0400 Received: from smtp-out.google.com ([74.125.121.67]:2164 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754652Ab1GNStZ (ORCPT ); Thu, 14 Jul 2011 14:49:25 -0400 Received: from kpbe20.cbf.corp.google.com (kpbe20.cbf.corp.google.com [172.25.105.84]) by smtp-out.google.com with ESMTP id p6EInNsS003052 for ; Thu, 14 Jul 2011 11:49:24 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1310669364; bh=/5gDdhL9w2zzNAqNWS17tFSPPmY=; h=From:To:Cc:Subject:Date:Message-Id; b=Bj/PR5cT82MZsuFcYFzMyhrVD74rreIqWo15qgUqKFU51V0XvOrDKfYe0idJ8eFun YfpL0fT10iIRrVx/x+Itg== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:to:cc:subject:date:message-id:x-mailer; b=J8C4lCNDiMso7hoBUwlGTzc/dfbINJOHR0SC6vkbg+7U0iivPEKAEX6NAFPi0jbvd 6ZUjC10ttkAd/udcK8s7A== Received: from dhcp-172-18-103-179.mtv.corp.google.com (dhcp-172-18-103-179.mtv.corp.google.com [172.18.103.179]) by kpbe20.cbf.corp.google.com with ESMTP id p6EInM8v026079; Thu, 14 Jul 2011 11:49:22 -0700 Received: by dhcp-172-18-103-179.mtv.corp.google.com (Postfix, from userid 20109) id 7DFF0AF5F89; Thu, 14 Jul 2011 11:49:22 -0700 (PDT) From: Nick Pelly To: linux-omap@vger.kernel.org Cc: Nick Pelly Subject: [PATCH] omap-serial: Allow IXON and IXOFF to be disabled. Date: Thu, 14 Jul 2011 11:49:20 -0700 Message-Id: <1310669360-752-1-git-send-email-npelly@google.com> X-Mailer: git-send-email 1.7.5.2 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 14 Jul 2011 18:49:27 +0000 (UTC) Fixes logic bug that software flow control cannot be disabled, because serial_omap_configure_xonxoff() is not called if both IXON and IXOFF bits are cleared. Signed-off-by: Nick Pelly Acked-by: Govindraj.R Tested-by: Govindraj.R --- drivers/tty/serial/omap-serial.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 47cadf4..6d3ec14 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -806,8 +806,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, serial_omap_set_mctrl(&up->port, up->port.mctrl); /* Software Flow Control Configuration */ - if (termios->c_iflag & (IXON | IXOFF)) - serial_omap_configure_xonxoff(up, termios); + serial_omap_configure_xonxoff(up, termios); spin_unlock_irqrestore(&up->port.lock, flags); dev_dbg(up->port.dev, "serial_omap_set_termios+%d\n", up->pdev->id);