aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:54:03 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:45 -0400
commit0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5 (patch)
treead73fef95b043284a6483c6cb87fb2f207b9010a /drivers
parent76b25a5509bbafdbfc7d7d6b41a3c64947d59360 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/mxser.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index 28f63566ab8a..97b1291ec224 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -1091,16 +1091,16 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou
1091 return total; 1091 return total;
1092} 1092}
1093 1093
1094static void mxser_put_char(struct tty_struct *tty, unsigned char ch) 1094static int mxser_put_char(struct tty_struct *tty, unsigned char ch)
1095{ 1095{
1096 struct mxser_port *info = tty->driver_data; 1096 struct mxser_port *info = tty->driver_data;
1097 unsigned long flags; 1097 unsigned long flags;
1098 1098
1099 if (!info->xmit_buf) 1099 if (!info->xmit_buf)
1100 return; 1100 return 0;
1101 1101
1102 if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) 1102 if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1)
1103 return; 1103 return 0;
1104 1104
1105 spin_lock_irqsave(&info->slock, flags); 1105 spin_lock_irqsave(&info->slock, flags);
1106 info->xmit_buf[info->xmit_head++] = ch; 1106 info->xmit_buf[info->xmit_head++] = ch;
@@ -1118,6 +1118,7 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch)
1118 spin_unlock_irqrestore(&info->slock, flags); 1118 spin_unlock_irqrestore(&info->slock, flags);
1119 } 1119 }
1120 } 1120 }
1121 return 1;
1121} 1122}
1122 1123
1123 1124