diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-23 17:26:43 -0400 |
---|---|---|
committer | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-06-23 17:26:43 -0400 |
commit | 67f7654ea1f11fac1cf4a33bf9a5d9079d122e70 (patch) | |
tree | a8909f33251ff04635f73d3f937f4ffbdb78aef4 | |
parent | 55d3b282b90620e02e825304a9433732a84c58a5 (diff) |
[PATCH] Serial: Bugs are not capabilities
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | drivers/serial/8250.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 341c644591ae..79f67fd863ec 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -1037,7 +1037,7 @@ static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start) | |||
1037 | up->ier |= UART_IER_THRI; | 1037 | up->ier |= UART_IER_THRI; |
1038 | serial_out(up, UART_IER, up->ier); | 1038 | serial_out(up, UART_IER, up->ier); |
1039 | 1039 | ||
1040 | if (up->capabilities & UART_BUG_TXEN) { | 1040 | if (up->bugs & UART_BUG_TXEN) { |
1041 | unsigned char lsr, iir; | 1041 | unsigned char lsr, iir; |
1042 | lsr = serial_in(up, UART_LSR); | 1042 | lsr = serial_in(up, UART_LSR); |
1043 | iir = serial_in(up, UART_IIR); | 1043 | iir = serial_in(up, UART_IIR); |
@@ -1564,13 +1564,13 @@ static int serial8250_startup(struct uart_port *port) | |||
1564 | serial_outp(up, UART_IER, 0); | 1564 | serial_outp(up, UART_IER, 0); |
1565 | 1565 | ||
1566 | if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) { | 1566 | if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) { |
1567 | if (!(up->capabilities & UART_BUG_TXEN)) { | 1567 | if (!(up->bugs & UART_BUG_TXEN)) { |
1568 | up->capabilities |= UART_BUG_TXEN; | 1568 | up->bugs |= UART_BUG_TXEN; |
1569 | pr_debug("ttyS%d - enabling bad tx status workarounds\n", | 1569 | pr_debug("ttyS%d - enabling bad tx status workarounds\n", |
1570 | port->line); | 1570 | port->line); |
1571 | } | 1571 | } |
1572 | } else { | 1572 | } else { |
1573 | up->capabilities &= ~UART_BUG_TXEN; | 1573 | up->bugs &= ~UART_BUG_TXEN; |
1574 | } | 1574 | } |
1575 | 1575 | ||
1576 | spin_unlock_irqrestore(&up->port.lock, flags); | 1576 | spin_unlock_irqrestore(&up->port.lock, flags); |