diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 03:54:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:46 -0400 |
commit | 6ae045767b2adae4e8fc054b980326a971ac4c8e (patch) | |
tree | 6c50866aed6b007c2ac593b40370dff260c67493 /drivers/char | |
parent | a5b08c66194fba02a865b397579b7204688bcb1e (diff) |
specialix: Switch to int put_char method
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>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/specialix.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c index 075ad924dd04..dfb7cd722ff8 100644 --- a/drivers/char/specialix.c +++ b/drivers/char/specialix.c | |||
@@ -1690,7 +1690,7 @@ static int sx_write(struct tty_struct * tty, | |||
1690 | } | 1690 | } |
1691 | 1691 | ||
1692 | 1692 | ||
1693 | static void sx_put_char(struct tty_struct * tty, unsigned char ch) | 1693 | static int sx_put_char(struct tty_struct * tty, unsigned char ch) |
1694 | { | 1694 | { |
1695 | struct specialix_port *port = (struct specialix_port *)tty->driver_data; | 1695 | struct specialix_port *port = (struct specialix_port *)tty->driver_data; |
1696 | unsigned long flags; | 1696 | unsigned long flags; |
@@ -1700,12 +1700,12 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch) | |||
1700 | 1700 | ||
1701 | if (sx_paranoia_check(port, tty->name, "sx_put_char")) { | 1701 | if (sx_paranoia_check(port, tty->name, "sx_put_char")) { |
1702 | func_exit(); | 1702 | func_exit(); |
1703 | return; | 1703 | return 0; |
1704 | } | 1704 | } |
1705 | dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf); | 1705 | dprintk (SX_DEBUG_TX, "check tty: %p %p\n", tty, port->xmit_buf); |
1706 | if (!port->xmit_buf) { | 1706 | if (!port->xmit_buf) { |
1707 | func_exit(); | 1707 | func_exit(); |
1708 | return; | 1708 | return 0; |
1709 | } | 1709 | } |
1710 | bp = port_Board(port); | 1710 | bp = port_Board(port); |
1711 | spin_lock_irqsave(&port->lock, flags); | 1711 | spin_lock_irqsave(&port->lock, flags); |
@@ -1715,7 +1715,7 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch) | |||
1715 | spin_unlock_irqrestore(&port->lock, flags); | 1715 | spin_unlock_irqrestore(&port->lock, flags); |
1716 | dprintk (SX_DEBUG_TX, "Exit size\n"); | 1716 | dprintk (SX_DEBUG_TX, "Exit size\n"); |
1717 | func_exit(); | 1717 | func_exit(); |
1718 | return; | 1718 | return 0; |
1719 | } | 1719 | } |
1720 | dprintk (SX_DEBUG_TX, "Handle xmit: %p %p\n", port, port->xmit_buf); | 1720 | dprintk (SX_DEBUG_TX, "Handle xmit: %p %p\n", port, port->xmit_buf); |
1721 | port->xmit_buf[port->xmit_head++] = ch; | 1721 | port->xmit_buf[port->xmit_head++] = ch; |
@@ -1724,6 +1724,7 @@ static void sx_put_char(struct tty_struct * tty, unsigned char ch) | |||
1724 | spin_unlock_irqrestore(&port->lock, flags); | 1724 | spin_unlock_irqrestore(&port->lock, flags); |
1725 | 1725 | ||
1726 | func_exit(); | 1726 | func_exit(); |
1727 | return 1; | ||
1727 | } | 1728 | } |
1728 | 1729 | ||
1729 | 1730 | ||