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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 C612BC169C4 for ; Mon, 11 Feb 2019 16:14:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96B1421B1C for ; Mon, 11 Feb 2019 16:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549901646; bh=zIuc1jMKdyBKdq1GqTjdwZmBk/2ehjvBH9lJHQ1MKSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m8asiGaYx2rgXTJddTkr+RiU8MBZDjeKulvZIOqSz40wQ4DjrB2M7X/sGUXJAU405 imTRtEKu8smOnBxfqDxTdjbDow8CqlvErAwM2l4hc9dz9hjTpjFIBrc8zdG8NvNDxf LKc85pmi6tmMBlBHfszcc3nCLyELBHPCQ8Y1U+Rg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727460AbfBKOWB (ORCPT ); Mon, 11 Feb 2019 09:22:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:54886 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728640AbfBKOWB (ORCPT ); Mon, 11 Feb 2019 09:22:01 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CAF87222AA; Mon, 11 Feb 2019 14:21:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549894920; bh=zIuc1jMKdyBKdq1GqTjdwZmBk/2ehjvBH9lJHQ1MKSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2EPmrGTAOJ0ZGfRrKSjVojvrwjCTAYHC7GaxMEPi5yFQ2gUH+ier21xByOqkELNMy DvbqnYnfBpeYrUS1fqiYYFdoZTSfS5CK4LaDHUc8DImdrJxKulkzKKh46Q9I886Xzo WMHpazQ4vWRtg/53EXP3LeQliousvqQIKbDwiwuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lukas Wunner , Andy Duan , Fabio Estevam , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sasha Levin Subject: [PATCH 4.20 031/352] serial: fsl_lpuart: clear parity enable bit when disable parity Date: Mon, 11 Feb 2019 15:14:18 +0100 Message-Id: <20190211141848.321240609@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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