Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

serial167: switch to int put_char method

Browse Source 
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
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:05 -07:00 committed by Linus Torvalds
parent bbbbb96f5e
commit a5b08c6619
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/serial167.c
View File

@ -1060,7 +1060,7 @@ static void config_setup(struct cyclades_port *info)
} /* config_setup */ } /* 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; struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
unsigned long flags; unsigned long flags;
@ -1070,7 +1070,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
#endif #endif
if (serial_paranoia_check(info, tty->name, "cy_put_char")) if (serial_paranoia_check(info, tty->name, "cy_put_char"))
return; return 0;
if (!info->xmit_buf) if (!info->xmit_buf)
return; return;
@ -1078,13 +1078,14 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
local_irq_save(flags); local_irq_save(flags);
if (info->xmit_cnt >= PAGE_SIZE - 1) { if (info->xmit_cnt >= PAGE_SIZE - 1) {
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 &= PAGE_SIZE - 1; info->xmit_head &= PAGE_SIZE - 1;
info->xmit_cnt++; info->xmit_cnt++;
local_irq_restore(flags); local_irq_restore(flags);
return 1;
} /* cy_put_char */ } /* cy_put_char */
static void cy_flush_chars(struct tty_struct *tty) static void cy_flush_chars(struct tty_struct *tty)