From 12f4bd38578804e850b5b7a790cac853bdf67a07 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 23 Jun 2005 22:26:43 +0100 Subject: [PATCH] --- yaml --- r: 3008 b: refs/heads/master c: 67f7654ea1f11fac1cf4a33bf9a5d9079d122e70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/8250.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 86d67ea837b0..2fda8d61a123 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55d3b282b90620e02e825304a9433732a84c58a5 +refs/heads/master: 67f7654ea1f11fac1cf4a33bf9a5d9079d122e70 diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c index 341c644591ae..79f67fd863ec 100644 --- a/trunk/drivers/serial/8250.c +++ b/trunk/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);