lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

amiserial: Switch put char to return success/fail

Browse Source 
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>
This commit is contained in:
Alan Cox
2008-04-30 00:54:02 -07:00
committed by Linus Torvalds
parent 4cd55ab1f9
commit 257afa3cb6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/char/amiserial.c
View File

@@ -832,33 +832,34 @@ static void change_speed(struct async_struct *info,
local_irq_restore(flags); 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; struct async_struct *info;
unsigned long flags; unsigned long flags;
if (!tty) if (!tty)
return; return 0;
info = tty->driver_data; info = tty->driver_data;
if (serial_paranoia_check(info, tty->name, "rs_put_char")) if (serial_paranoia_check(info, tty->name, "rs_put_char"))
return; return 0;
if (!info->xmit.buf) if (!info->xmit.buf)
return; return 0;
local_irq_save(flags); local_irq_save(flags);
if (CIRC_SPACE(info->xmit.head, if (CIRC_SPACE(info->xmit.head,
info->xmit.tail, info->xmit.tail,
SERIAL_XMIT_SIZE) == 0) { SERIAL_XMIT_SIZE) == 0) {
local_irq_restore(flags); local_irq_restore(flags);
return; return 0;
} }
info->xmit.buf[info->xmit.head++] = ch; info->xmit.buf[info->xmit.head++] = ch;
info->xmit.head &= SERIAL_XMIT_SIZE-1; info->xmit.head &= SERIAL_XMIT_SIZE-1;
local_irq_restore(flags); local_irq_restore(flags);
return 1;
} }
static void rs_flush_chars(struct tty_struct *tty) static void rs_flush_chars(struct tty_struct *tty)