diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 09:54:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 17:29:45 +0200 |
| commit | 257afa3cb6beaad60849655cb272d4b9de74cf63 (patch) | |
| tree | 8c1620cab6a6da7f397b796dc2fc4176dc2d3940 /drivers | |
| parent | usb gadget: switch to put_char returning int (diff) | |
| download | linux-257afa3cb6beaad60849655cb272d4b9de74cf63.tar.xz linux-257afa3cb6beaad60849655cb272d4b9de74cf63.zip | |
amiserial: Switch put char to return success/fail
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/amiserial.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index a5f3956a5971..37457e5a4f2b 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c @@ -832,33 +832,34 @@ static void change_speed(struct async_struct *info, 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) |