commit 67f7654ea1f11fac1cf4a33bf9a5d9079d122e70
author Russell King <rmk@dyn-67.arm.linux.org.uk> Thu Jun 23 22:26:43 2005 +0100
committer Russell King <rmk@dyn-67.arm.linux.org.uk> Thu Jun 23 22:26:43 2005 +0100
tree a8909f33251ff04635f73d3f937f4ffbdb78aef4
parent 55d3b282b90620e02e825304a9433732a84c58a5

[PATCH] Serial: Bugs are not capabilities

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

drivers/serial/8250.c

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 341c644..79f67fd 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1037,7 +1037,7 @@
 		up->ier |= UART_IER_THRI;
 		serial_out(up, UART_IER, up->ier);
 
-		if (up->capabilities & UART_BUG_TXEN) {
+		if (up->bugs & UART_BUG_TXEN) {
 			unsigned char lsr, iir;
 			lsr = serial_in(up, UART_LSR);
 			iir = serial_in(up, UART_IIR);
@@ -1564,13 +1564,13 @@
 	serial_outp(up, UART_IER, 0);
 
 	if (lsr & UART_LSR_TEMT && iir & UART_IIR_NO_INT) {
-		if (!(up->capabilities & UART_BUG_TXEN)) {
-			up->capabilities |= UART_BUG_TXEN;
+		if (!(up->bugs & UART_BUG_TXEN)) {
+			up->bugs |= UART_BUG_TXEN;
 			pr_debug("ttyS%d - enabling bad tx status workarounds\n",
 				 port->line);
 		}
 	} else {
-		up->capabilities &= ~UART_BUG_TXEN;
+		up->bugs &= ~UART_BUG_TXEN;
 	}
 
 	spin_unlock_irqrestore(&up->port.lock, flags);