Skip to content

L
linux-davinci
Commit 67f7654e authored by Russell King's avatar Russell King
Browse files
Options

[PATCH] Serial: Bugs are not capabilities 

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 55d3b282
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
drivers/serial/8250.c
View file @ 67f7654e
...@@ -1037,7 +1037,7 @@ static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start) ...@@ -1037,7 +1037,7 @@ static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
up->ier |= UART_IER_THRI; up->ier |= UART_IER_THRI;
serial_out(up, UART_IER, up->ier); serial_out(up, UART_IER, up->ier);
if (up->capabilities & UART_BUG_TXEN) { if (up->bugs & UART_BUG_TXEN) {
unsigned char lsr, iir; unsigned char lsr, iir;
lsr = serial_in(up, UART_LSR); lsr = serial_in(up, UART_LSR);
iir = serial_in(up, UART_IIR); iir = serial_in(up, UART_IIR);
...@@ -1564,13 +1564,13 @@ static int serial8250_startup(struct uart_port *port) ...@@ -1564,13 +1564,13 @@ static int serial8250_startup(struct uart_port *port)
serial_outp(up, UART_IER, 0); serial_outp(up, UART_IER, 0);
if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) { if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) {
if (!(up->capabilities & UART_BUG_TXEN)) { if (!(up->bugs & UART_BUG_TXEN)) {
up->capabilities |= UART_BUG_TXEN; up->bugs |= UART_BUG_TXEN;
pr_debug("ttyS%d - enabling bad tx status workarounds\n", pr_debug("ttyS%d - enabling bad tx status workarounds\n",
port->line); port->line);
} }
} else { } else {
up->capabilities &= ~UART_BUG_TXEN; up->bugs &= ~UART_BUG_TXEN;
} }
spin_unlock_irqrestore(&up->port.lock, flags); spin_unlock_irqrestore(&up->port.lock, flags);
......
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