diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-25 22:40:43 -0700 |
| commit | 9b8d90b963dcc6d3f3f6a616b3547ea1c8b03525 (patch) | |
| tree | bca8230897630ca6721bdd7b959142984afa256a /drivers/tty/serial/ip22zilog.c | |
| parent | 644a918d20336a7deaa81f675c3c2f25bf3dafbb (diff) | |
| parent | d7933ab727ed035bdf420d7381b831ba959cecc5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/tty/serial/ip22zilog.c')
| -rw-r--r-- | drivers/tty/serial/ip22zilog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c index 1d9420548e16..1efd4c36ba0c 100644 --- a/drivers/tty/serial/ip22zilog.c +++ b/drivers/tty/serial/ip22zilog.c @@ -850,7 +850,7 @@ ip22zilog_convert_to_zs(struct uart_ip22zilog_port *up, unsigned int cflag, up->port.read_status_mask = Rx_OVR; if (iflag & INPCK) up->port.read_status_mask |= CRC_ERR | PAR_ERR; - if (iflag & (BRKINT | PARMRK)) + if (iflag & (IGNBRK | BRKINT | PARMRK)) up->port.read_status_mask |= BRK_ABRT; up->port.ignore_status_mask = 0; |