diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-06-25 07:41:54 +0200 |
| commit | 98d350cf7ae077eb8083ccc7c1bfc838344ac590 (patch) | |
| tree | dfee7af0eff981b941db6bdbd1d5f039f9f85407 /drivers/tty/serial/sccnxp.c | |
| parent | sh, perf: Use common PMU interrupt disabled code (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.tar.gz linux-98d350cf7ae077eb8083ccc7c1bfc838344ac590.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/tty/serial/sccnxp.c')
| -rw-r--r-- | drivers/tty/serial/sccnxp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sccnxp.c b/drivers/tty/serial/sccnxp.c index 5443b46345ed..e84b6a3bdd18 100644 --- a/drivers/tty/serial/sccnxp.c +++ b/drivers/tty/serial/sccnxp.c @@ -665,7 +665,7 @@ static void sccnxp_set_termios(struct uart_port *port, port->read_status_mask = SR_OVR; if (termios->c_iflag & INPCK) port->read_status_mask |= SR_PE | SR_FE; - if (termios->c_iflag & (BRKINT | PARMRK)) + if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) port->read_status_mask |= SR_BRK; /* Set status ignore mask */ |