aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-23 22:26:43 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-23 22:26:43 +0100
commit67f7654ea1f11fac1cf4a33bf9a5d9079d122e70 (patch)
treea8909f33251ff04635f73d3f937f4ffbdb78aef4 /drivers/serial/8250.c
parent55d3b282b90620e02e825304a9433732a84c58a5 (diff)
downloadkernel_samsung_smdk4412-67f7654ea1f11fac1cf4a33bf9a5d9079d122e70.zip
kernel_samsung_smdk4412-67f7654ea1f11fac1cf4a33bf9a5d9079d122e70.tar.gz
kernel_samsung_smdk4412-67f7654ea1f11fac1cf4a33bf9a5d9079d122e70.tar.bz2
[PATCH] Serial: Bugs are not capabilities
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial/8250.c')
-rw-r--r--drivers/serial/8250.c8
1 files changed, 4 insertions, 4 deletions
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 @@ static void serial8250_start_tx(struct uart_port *port, unsigned int tty_start)
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 @@ static int serial8250_startup(struct uart_port *port)
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);