diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 18:33:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-22 18:33:51 +0200 |
| commit | ef7994fa2aecd8d1fb0d75034caa050ff908d26a (patch) | |
| tree | aa7bbe9499256ced149dce70891de5eedf33c283 /drivers/tty/serial/dz.c | |
| parent | staging: rtl8723au: issue_probersp(): No need to calculate location of IEs, w... (diff) | |
| parent | Linux 3.16-rc2 (diff) | |
| download | linux-ef7994fa2aecd8d1fb0d75034caa050ff908d26a.tar.xz linux-ef7994fa2aecd8d1fb0d75034caa050ff908d26a.zip | |
Merge 3.16-rc2 into staging-next
We want the staging fixes here as well.
Diffstat (limited to 'drivers/tty/serial/dz.c')
| -rw-r--r-- | drivers/tty/serial/dz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c index 2f2b2e538a54..cdbbc788230a 100644 --- a/drivers/tty/serial/dz.c +++ b/drivers/tty/serial/dz.c @@ -625,7 +625,7 @@ static void dz_set_termios(struct uart_port *uport, struct ktermios *termios, dport->port.read_status_mask = DZ_OERR; if (termios->c_iflag & INPCK) dport->port.read_status_mask |= DZ_FERR | DZ_PERR; - if (termios->c_iflag & (BRKINT | PARMRK)) + if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) dport->port.read_status_mask |= DZ_BREAK; /* characters to ignore */ |