The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH] sunsu compile fixes
@ 2005-09-06  0:42 viro
  0 siblings, 0 replies; only message in thread
From: viro @ 2005-09-06  0:42 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: rmk+serial, David S. Miller, linux-kernel

sunsu had been broken by ->stop_tx/->start_tx API changes.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN RC13-git5-sata_qstor/drivers/serial/sunsu.c RC13-git5-sunsu/drivers/serial/sunsu.c
--- RC13-git5-sata_qstor/drivers/serial/sunsu.c	2005-09-05 07:05:15.000000000 -0400
+++ RC13-git5-sunsu/drivers/serial/sunsu.c	2005-09-05 16:41:08.000000000 -0400
@@ -269,7 +269,10 @@
 
 	__stop_tx(up);
 
-	if (up->port.type == PORT_16C950 && tty_stop /*FIXME*/) {
+	/*
+	 * We really want to stop the transmitter from sending.
+	 */
+	if (up->port.type == PORT_16C950) {
 		up->acr |= UART_ACR_TXDIS;
 		serial_icr_write(up, UART_ACR, up->acr);
 	}
@@ -283,10 +286,11 @@
 		up->ier |= UART_IER_THRI;
 		serial_out(up, UART_IER, up->ier);
 	}
+
 	/*
-	 * We only do this from uart_start
+	 * Re-enable the transmitter if we disabled it.
 	 */
-	if (tty_start && up->port.type == PORT_16C950 /*FIXME*/) {
+	if (up->port.type == PORT_16C950 && up->acr & UART_ACR_TXDIS) {
 		up->acr &= ~UART_ACR_TXDIS;
 		serial_icr_write(up, UART_ACR, up->acr);
 	}

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-09-06  0:42 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-09-06  0:42 [PATCH] sunsu compile fixes viro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox