openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mxser: switch to put_char being int 

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:03 -07:00 committed by Linus Torvalds
parent 76b25a5509
commit 0be2eadee7
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/mxser.c
View File

@ -1091,16 +1091,16 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou
return total; return total;
} }
static void mxser_put_char(struct tty_struct *tty, unsigned char ch) static int mxser_put_char(struct tty_struct *tty, unsigned char ch)
{ {
struct mxser_port *info = tty->driver_data; struct mxser_port *info = tty->driver_data;
unsigned long flags; unsigned long flags;
if (!info->xmit_buf) if (!info->xmit_buf)
return; return 0;
if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
return; return 0;
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->slock, flags);
info->xmit_buf[info->xmit_head++] = ch; info->xmit_buf[info->xmit_head++] = ch;
@ -1118,6 +1118,7 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch)
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->slock, flags);
} }
} }
return 1;
} }