diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 03:54:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:46 -0400 |
commit | d7e752e2757fba49178f4b1af4778ca64d305cbb (patch) | |
tree | ad70ad2101a33e225c22b5205b16a79557fc1416 /drivers/char | |
parent | 0be2eadee7baff96d2c7339be4bc2a0f5c96e4f5 (diff) |
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/char')
-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) | |||
1545 | 1545 | ||
1546 | /* Add a character to the transmit buffer | 1546 | /* Add a character to the transmit buffer |
1547 | */ | 1547 | */ |
1548 | static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) | 1548 | static int mgslpc_put_char(struct tty_struct *tty, unsigned char ch) |
1549 | { | 1549 | { |
1550 | MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; | 1550 | MGSLPC_INFO *info = (MGSLPC_INFO *)tty->driver_data; |
1551 | unsigned long flags; | 1551 | unsigned long flags; |
@@ -1556,10 +1556,10 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) | |||
1556 | } | 1556 | } |
1557 | 1557 | ||
1558 | if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char")) | 1558 | if (mgslpc_paranoia_check(info, tty->name, "mgslpc_put_char")) |
1559 | return; | 1559 | return 0; |
1560 | 1560 | ||
1561 | if (!info->tx_buf) | 1561 | if (!info->tx_buf) |
1562 | return; | 1562 | return 0; |
1563 | 1563 | ||
1564 | spin_lock_irqsave(&info->lock,flags); | 1564 | spin_lock_irqsave(&info->lock,flags); |
1565 | 1565 | ||
@@ -1572,6 +1572,7 @@ static void mgslpc_put_char(struct tty_struct *tty, unsigned char ch) | |||
1572 | } | 1572 | } |
1573 | 1573 | ||
1574 | spin_unlock_irqrestore(&info->lock,flags); | 1574 | spin_unlock_irqrestore(&info->lock,flags); |
1575 | return 1; | ||
1575 | } | 1576 | } |
1576 | 1577 | ||
1577 | /* Enable transmitter so remaining characters in the | 1578 | /* Enable transmitter so remaining characters in the |