[PATCH] amiserial: Switch put char to return success/fail

From: Alan Cox
Date: Sun Apr 13 2008 - 13:14:13 EST


Signed-off-by: Alan Cox <alan@xxxxxxxxxx>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/char/amiserial.c linux-2.6.25-rc8-mm2/drivers/char/amiserial.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/char/amiserial.c 2008-04-13 15:36:53.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/char/amiserial.c 2008-04-13 15:50:20.000000000 +0100
@@ -832,33 +832,34 @@
local_irq_restore(flags);
}

-static void rs_put_char(struct tty_struct *tty, unsigned char ch)
+static int rs_put_char(struct tty_struct *tty, unsigned char ch)
{
struct async_struct *info;
unsigned long flags;

if (!tty)
- return;
+ return 0;

info = tty->driver_data;

if (serial_paranoia_check(info, tty->name, "rs_put_char"))
- return;
+ return 0;

if (!info->xmit.buf)
- return;
+ return 0;

local_irq_save(flags);
if (CIRC_SPACE(info->xmit.head,
info->xmit.tail,
SERIAL_XMIT_SIZE) == 0) {
local_irq_restore(flags);
- return;
+ return 0;
}

info->xmit.buf[info->xmit.head++] = ch;
info->xmit.head &= SERIAL_XMIT_SIZE-1;
local_irq_restore(flags);
+ return 1;
}

static void rs_flush_chars(struct tty_struct *tty)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/