commit 6ae045767b2adae4e8fc054b980326a971ac4c8e
author Alan Cox <alan@lxorguk.ukuu.org.uk> Wed Apr 30 00:54:07 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Apr 30 08:29:46 2008 -0700
tree 6c50866aed6b007c2ac593b40370dff260c67493
parent a5b08c66194fba02a865b397579b7204688bcb1e

specialix: Switch to int put_char method

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/char/specialix.c

diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 075ad92..dfb7cd7 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -1690,7 +1690,7 @@
 }
 
 
-static void sx_put_char(struct tty_struct * tty, unsigned char ch)
+static int sx_put_char(struct tty_struct * tty, unsigned char ch)
 {
 	struct specialix_port *port = (struct specialix_port *)tty->driver_data;
 	unsigned long flags;
@@ -1700,12 +1700,12 @@
 
 	if (sx_paranoia_check(port, tty->name, "sx_put_char")) {
 		func_exit();
-		return;
+		return 0;
 	}
 	dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf);
 	if (!port->xmit_buf) {
 		func_exit();
-		return;
+		return 0;
 	}
 	bp = port_Board(port);
 	spin_lock_irqsave(&port->lock, flags);
@@ -1715,7 +1715,7 @@
 		spin_unlock_irqrestore(&port->lock, flags);
 		dprintk (SX_DEBUG_TX, "Exit size\n");
 		func_exit();
-		return;
+		return 0;
 	}
 	dprintk (SX_DEBUG_TX, "Handle xmit: %p %p\n", port, port->xmit_buf);
 	port->xmit_buf[port->xmit_head++] = ch;
@@ -1724,6 +1724,7 @@
 	spin_unlock_irqrestore(&port->lock, flags);
 
 	func_exit();
+	return 1;
 }