From 80a786f98ca274f4947744ca4499418e45ce1e6d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:54:03 -0700 Subject: [PATCH] --- yaml --- r: 95222 b: refs/heads/master c: 0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/mxser.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5db3b3dc3d01..857be8096768 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76b25a5509bbafdbfc7d7d6b41a3c64947d59360 +refs/heads/master: 0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5 diff --git a/trunk/drivers/char/mxser.c b/trunk/drivers/char/mxser.c index 28f63566ab8a..97b1291ec224 100644 --- a/trunk/drivers/char/mxser.c +++ b/trunk/drivers/char/mxser.c @@ -1091,16 +1091,16 @@ static int mxser_write(struct tty_struct *tty, const unsigned char *buf, int cou 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; unsigned long flags; if (!info->xmit_buf) - return; + return 0; if (info->xmit_cnt >= SERIAL_XMIT_SIZE - 1) - return; + return 0; spin_lock_irqsave(&info->slock, flags); 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); } } + return 1; }