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

Next file: linux-2.4.23/drivers/char/sh-sci.c
Previous file: linux-2.4.23/drivers/char/ser_a2232.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/drivers/char/serial.c linux-2.4.23/drivers/char/serial.c
@@ -914,10 +914,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
 		if (pass_counter++ > RS_ISR_PASS_LIMIT) {
 #if SERIAL_DEBUG_INTR
 			printk("rs_single loop break.\n");

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