diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 18:13:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 18:13:41 +0200 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /drivers/tty/serial/sirfsoc_uart.c | |
| parent | ALSA: hda - add capture mute led support in led_power_filter (diff) | |
| parent | ALSA: pcm: Add timestamp type to sw_params (diff) | |
| download | linux-03fe805a098422d27cbbbad29a54ff1349da3622.tar.xz linux-03fe805a098422d27cbbbad29a54ff1349da3622.zip | |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'drivers/tty/serial/sirfsoc_uart.c')
| -rw-r--r-- | drivers/tty/serial/sirfsoc_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index 1f2be48c92ce..9b4d71cff00d 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -896,7 +896,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port, if (termios->c_iflag & INPCK) port->read_status_mask |= uint_en->sirfsoc_frm_err_en; } - if (termios->c_iflag & (BRKINT | PARMRK)) + if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) port->read_status_mask |= uint_en->sirfsoc_rxd_brk_en; if (sirfport->uart_reg->uart_type == SIRF_REAL_UART) { if (termios->c_iflag & IGNPAR) |