Commit d7e752e2 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

pcmcia: serial to int put_char method

Signed-off-by: default avatarAlan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0be2eade
...@@ -1545,7 +1545,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info) ...@@ -1545,7 +1545,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info)
/* Add a character to the transmit buffer /* 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; MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data;
unsigned long flags; unsigned long flags;
...@@ -1556,10 +1556,10 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -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")) if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char"))
return; return 0;
if (!info->tx_buf) if (!info->tx_buf)
return; return 0;
spin_lock_irqsave(&info->lock,flags); spin_lock_irqsave(&info->lock,flags);
...@@ -1572,6 +1572,7 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -1572,6 +1572,7 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch)
} }
spin_unlock_irqrestore(&info->lock,flags); spin_unlock_irqrestore(&info->lock,flags);
return 1;
} }
/* Enable transmitter so remaining characters in the /* Enable transmitter so remaining characters in the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment