aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/imx.c
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2014-12-18 12:37:13 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-01-09 14:28:17 -0800
commit8d267fd98b7706a6296409b69bf2cca42087a9ef (patch)
tree052ff9687c1260e23fcd905678a8a1035df00b58 /drivers/tty/serial/imx.c
parentserial: altera-uart: fix NULL device in log message (diff)
downloadlinux-dev-8d267fd98b7706a6296409b69bf2cca42087a9ef.tar.xz
linux-dev-8d267fd98b7706a6296409b69bf2cca42087a9ef.zip
serial: imx: preserve characters with parity or framing errors
If IGNPAR/INPCK are clear in termios->c_iflag, characters received with parity or framing errors should be preserved and passed to the upper layers of the tty stack. Specifically, the decision of whether to set the character value to zero should be made by n_tty.c/n_tty_receive_parity_error(). Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Reviewed-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/imx.c')
-rw-r--r--drivers/tty/serial/imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 72b800b296b1..6ac22d75a4bb 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -733,7 +733,7 @@ static irqreturn_t imx_rxint(int irq, void *dev_id)
continue;
}
- rx &= sport->port.read_status_mask;
+ rx &= (sport->port.read_status_mask | 0xFF);
if (rx & URXD_BRK)
flg = TTY_BREAK;