Commit 5797ae36 authored by Stephane Chazelas's avatar Stephane Chazelas Committed by Linus Torvalds

serial: MPSC: Stop rx engine when CREAD cleared

Currently, the MPSC driver doesn't stop recieving characters when the CREAD
flag in termios->c_cflag is cleared.  It should.  Also, only start receiving
if its not already started.
Signed-off-by: default avatarStephane Chazelas <stephane@artesyncp.com>
Signed-off-by: default avatarMark A. Greer <mgreer@mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6c1ead5e
...@@ -1520,7 +1520,6 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1520,7 +1520,6 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
mpsc_set_baudrate(pi, baud); mpsc_set_baudrate(pi, baud);
/* Characters/events to read */ /* Characters/events to read */
pi->rcv_data = 1;
pi->port.read_status_mask = SDMA_DESC_CMDSTAT_OR; pi->port.read_status_mask = SDMA_DESC_CMDSTAT_OR;
if (termios->c_iflag & INPCK) if (termios->c_iflag & INPCK)
...@@ -1544,11 +1543,15 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -1544,11 +1543,15 @@ mpsc_set_termios(struct uart_port *port, struct ktermios *termios,
pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_OR; pi->port.ignore_status_mask |= SDMA_DESC_CMDSTAT_OR;
} }
/* Ignore all chars if CREAD not set */ if ((termios->c_cflag & CREAD)) {
if (!(termios->c_cflag & CREAD)) if (!pi->rcv_data) {
pi->rcv_data = 0; pi->rcv_data = 1;
else
mpsc_start_rx(pi); mpsc_start_rx(pi);
}
} else if (pi->rcv_data) {
mpsc_stop_rx(port);
pi->rcv_data = 0;
}
spin_unlock_irqrestore(&pi->port.lock, flags); spin_unlock_irqrestore(&pi->port.lock, flags);
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment