diff options
| author | Alan Cox | 2008-04-30 09:54:04 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-30 17:29:46 +0200 |
| commit | d7e752e2757fba49178f4b1af4778ca64d305cbb (patch) | |
| tree | ad70ad2101a33e225c22b5205b16a79557fc1416 /drivers | |
| parent | mxser: switch to put_char being int (diff) | |
| download | kernel-qcow2-linux-d7e752e2757fba49178f4b1af4778ca64d305cbb.tar.gz kernel-qcow2-linux-d7e752e2757fba49178f4b1af4778ca64d305cbb.tar.xz kernel-qcow2-linux-d7e752e2757fba49178f4b1af4778ca64d305cbb.zip | |
pcmcia: serial to int put_char method
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 45d8eb5de69f..1dd0e992c83d 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -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; @@ -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); @@ -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 |