diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 05:11:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 05:11:22 -0400 |
| commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
| tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /drivers/tty/serial/sccnxp.c | |
| parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
| parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
Merge branch 'for-next' into for-linus
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, | |||
| 665 | port->read_status_mask = SR_OVR; | 665 | port->read_status_mask = SR_OVR; |
| 666 | if (termios->c_iflag & INPCK) | 666 | if (termios->c_iflag & INPCK) |
| 667 | port->read_status_mask |= SR_PE | SR_FE; | 667 | port->read_status_mask |= SR_PE | SR_FE; |
| 668 | if (termios->c_iflag & (BRKINT | PARMRK)) | 668 | if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) |
| 669 | port->read_status_mask |= SR_BRK; | 669 | port->read_status_mask |= SR_BRK; |
| 670 | 670 | ||
| 671 | /* Set status ignore mask */ | 671 | /* Set status ignore mask */ |