Skip to content

Commit

Permalink
pcmcia: serial to int put_char method
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Paul Fulghum <paulkf@microgate.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 0be2ead commit d7e752e
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/char/pcmcia/synclink_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info)

/* Add a character to the transmit buffer
*/
static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch)
static int mgslpc_put_char(struct tty_struct *tty, unsigned char ch)
{
MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
unsigned long flags;
Expand All @@ -1556,10 +1556,10 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch)
}

if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char"))
return;
return 0;

if (!info->tx_buf)
return;
return 0;

spin_lock_irqsave(&info->lock,flags);

Expand All @@ -1572,6 +1572,7 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch)
}

spin_unlock_irqrestore(&info->lock,flags);
return 1;
}

/* Enable transmitter so remaining characters in the
Expand Down

0 comments on commit d7e752e

Please sign in to comment.