Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alan Cox and committed by
Linus Torvalds
0be2eade 76b25a55

+4 -3
+4 -3
drivers/char/mxser.c
··· 1091 1091 return total; 1092 1092 } 1093 1093 1094 - static void mxser_put_char(struct tty_struct *tty, unsigned char ch) 1094 + static int mxser_put_char(struct tty_struct *tty, unsigned char ch) 1095 1095 { 1096 1096 struct mxser_port *info = tty->driver_data; 1097 1097 unsigned long flags; 1098 1098 1099 1099 if (!info->xmit_buf) 1100 - return; 1100 + return 0; 1101 1101 1102 1102 if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) 1103 - return; 1103 + return 0; 1104 1104 1105 1105 spin_lock_irqsave(&info->slock, flags); 1106 1106 info->xmit_buf[info->xmit_head++] = ch; ··· 1118 1118 spin_unlock_irqrestore(&info->slock, flags); 1119 1119 } 1120 1120 } 1121 + return 1; 1121 1122 } 1122 1123 1123 1124