Skip to content

Commit

Permalink
mxser: switch to put_char being int
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 30, 2008
1 parent 76b25a5 commit 0be2ead
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/char/mxser.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -1118,6 +1118,7 @@ static void mxser_put_char(struct tty_struct *tty, unsigned char ch)
spin_unlock_irqrestore(&info->slock, flags);
}
}
return 1;
}


Expand Down

0 comments on commit 0be2ead

Please sign in to comment.