diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 16:59:24 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 16:59:24 +0400 |
| commit | cda390bb8f0fc751194ef5f4c691ca8d3ff91009 (patch) | |
| tree | 9739758690c5107b73a09f632ae2f8fc2507db09 /drivers/tty/serial/mpsc.c | |
| parent | 9a2c33a422d60e8e55c5aff6752522dc39993b16 (diff) | |
| parent | 449fd15fbcde239875031d70fd06abb4a0e1ed09 (diff) | |
| download | linux-cda390bb8f0fc751194ef5f4c691ca8d3ff91009.tar.xz | |
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'drivers/tty/serial/mpsc.c')
| -rw-r--r-- | drivers/tty/serial/mpsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c index e30a3ca3cea3..759c6a6fa74a 100644 --- a/drivers/tty/serial/mpsc.c +++ b/drivers/tty/serial/mpsc.c @@ -1458,7 +1458,7 @@ static void mpsc_set_termios(struct uart_port *port, struct ktermios *termios, pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_PE | SDMA_DESC_CMDSTAT_FR; - if (termios->c_iflag & (BRKINT | PARMRK)) + if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) pi->port.read_status_mask |= SDMA_DESC_CMDSTAT_BR; /* Characters/events to ignore */ |