From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE180C282C8 for ; Mon, 28 Jan 2019 17:50:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 737A420881 for ; Mon, 28 Jan 2019 17:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548697816; bh=i5w5CZVQYbywdrxtnbusfUmUoEtZOGTCSz78OePGLUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=szSvKwsHz5HFgAvdxjoD7Ju5nY42pwBWJsStuorv9mFDhH3Y1IApXeNB4QKWzFIsl eeVCvW8Ovb/RYGdexDJSLgwm+M9pH07CtggiyLvwEJ7FKlHBNC3D23+BXU7boCDj/R PVBwkU7siHTwqfTQgxwYlkT1MUJa9mj9QiByK9J8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727516AbfA1Pos (ORCPT ); Mon, 28 Jan 2019 10:44:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:58136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727513AbfA1Por (ORCPT ); Mon, 28 Jan 2019 10:44:47 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DADF32173C; Mon, 28 Jan 2019 15:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548690287; bh=i5w5CZVQYbywdrxtnbusfUmUoEtZOGTCSz78OePGLUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2GbZuoHnS2Ygu6/+Ux94F7d3RsQTq1dp0Cgnn3aTO7Sy8ahMt6y6M24UzXYdxz4xu YQ6L4xOMbtohD27UWFf40c94GX/WHYDHnmCmaLMD8zhHEGwZAKq6Jh09rbu9LJcjo/ wcI3aR5Gf3c52FoI1h8JUfAxDUyUhYaeeiSrf90A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Duan , Lukas Wunner , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 034/304] serial: fsl_lpuart: clear parity enable bit when disable parity Date: Mon, 28 Jan 2019 10:39:11 -0500 Message-Id: <20190128154341.47195-34-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128154341.47195-1-sashal@kernel.org> References: <20190128154341.47195-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Duan [ Upstream commit 397bd9211fe014b347ca8f95a8f4e1017bac1aeb ] Current driver only enable parity enable bit and never clear it when user set the termios. The fix clear the parity enable bit when PARENB flag is not set in termios->c_cflag. Cc: Lukas Wunner Signed-off-by: Andy Duan Reviewed-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/fsl_lpuart.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 00c220e4f43c..086642ea4b26 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -1479,6 +1479,8 @@ lpuart_set_termios(struct uart_port *port, struct ktermios *termios, else cr1 &= ~UARTCR1_PT; } + } else { + cr1 &= ~UARTCR1_PE; } /* ask the core to calculate the divisor */ @@ -1690,6 +1692,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios, else ctrl &= ~UARTCTRL_PT; } + } else { + ctrl &= ~UARTCTRL_PE; } /* ask the core to calculate the divisor */ -- 2.19.1