patch-2.4.21 linux-2.4.21/drivers/char/serial.c

Next file: linux-2.4.21/drivers/char/sonypi.c
Previous file: linux-2.4.21/drivers/char/scx200_wdt.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.20/drivers/char/serial.c linux-2.4.21/drivers/char/serial.c
@@ -842,10 +842,15 @@
 		if (status & UART_LSR_DR)
 			receive_chars(info, &status, regs);
 		check_modem_status(info);
+#ifdef CONFIG_MELAN
 		if ((status & UART_LSR_THRE) ||
 			/* for buggy ELAN processors */
 			((iir & UART_IIR_ID) == UART_IIR_THRI))
 			transmit_chars(info, 0);
+#else
+		if (status & UART_LSR_THRE)
+			transmit_chars(info, 0);
+#endif
 
 	next:
 		info = info->next_port;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)