X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fserial%2F8250.c;h=67877b1be0dd818e08b634d3d3c1d715603889c5;hb=1a19ce1c6a029c0ef00059129ce4b8c64a2925c6;hp=4de99ffa0b7d2b7d822e23067feeed51383d37b5;hpb=af9b42cda273c31996c548a076e884fb1082ac75;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 4de99ffa0b7..67877b1be0d 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2087,6 +2087,20 @@ static int serial8250_startup(struct uart_port *port)
 
 	serial8250_set_mctrl(&up->port, up->port.mctrl);
 
+	/* Serial over Lan (SoL) hack:
+	   Intel 8257x Gigabit ethernet chips have a
+	   16550 emulation, to be used for Serial Over Lan.
+	   Those chips take a longer time than a normal
+	   serial device to signalize that a transmission
+	   data was queued. Due to that, the above test generally
+	   fails. One solution would be to delay the reading of
+	   iir. However, this is not reliable, since the timeout
+	   is variable. So, let's just don't test if we receive
+	   TX irq. This way, we'll never enable UART_BUG_TXEN.
+	 */
+	if (up->port.flags & UPF_NO_TXEN_TEST)
+		goto dont_test_tx_en;
+
 	/*
 	 * Do a quick test to see if we receive an
 	 * interrupt when we enable the TX irq.
@@ -2106,6 +2120,7 @@ static int serial8250_startup(struct uart_port *port)
 		up->bugs &= ~UART_BUG_TXEN;
 	}
 
+dont_test_tx_en:
 	spin_unlock_irqrestore(&up->port.lock, flags);
 
 	/*