public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] serial167: switch to int put_char method
@ 2008-04-13 17:16 Alan Cox
  0 siblings, 0 replies; only message in thread
From: Alan Cox @ 2008-04-13 17:16 UTC (permalink / raw)
  To: akpm, linux-kernel, linux-m68k

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/char/serial167.c linux-2.6.25-rc8-mm2/drivers/char/serial167.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/char/serial167.c	2008-04-13 15:36:53.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/char/serial167.c	2008-04-13 15:41:05.000000000 +0100
@@ -1060,7 +1060,7 @@
 
 }				/* config_setup */
 
-static void cy_put_char(struct tty_struct *tty, unsigned char ch)
+static int cy_put_char(struct tty_struct *tty, unsigned char ch)
 {
 	struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
 	unsigned long flags;
@@ -1070,7 +1070,7 @@
 #endif
 
 	if (serial_paranoia_check(info, tty->name, "cy_put_char"))
-		return;
+		return 0;
 
 	if (!info->xmit_buf)
 		return;
@@ -1078,13 +1078,14 @@
 	local_irq_save(flags);
 	if (info->xmit_cnt >= PAGE_SIZE - 1) {
 		local_irq_restore(flags);
-		return;
+		return 0;
 	}
 
 	info->xmit_buf[info->xmit_head++] = ch;
 	info->xmit_head &= PAGE_SIZE - 1;
 	info->xmit_cnt++;
 	local_irq_restore(flags);
+	return 1;
 }				/* cy_put_char */
 
 static void cy_flush_chars(struct tty_struct *tty)

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

only message in thread, other threads:[~2008-04-13 17:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-13 17:16 [PATCH] serial167: switch to int put_char method Alan Cox

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