aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/rocket.c
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:54:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:46 -0400
commitbbbbb96f5ea84971545ecae5a9ec50387cd9c6a3 (patch)
tree91ccad37c7f12a264e49c204989f214c26b87b95 /drivers/char/rocket.c
parentd7e752e2757fba49178f4b1af4778ca64d305cbb (diff)
riscom/rocket: 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/rocket.c')
-rw-r--r--drivers/char/rocket.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 00cfb6c7fd46..743dc80a9325 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -1663,14 +1663,14 @@ static void rp_hangup(struct tty_struct *tty)
1663 * writing routines will write directly to transmit FIFO. 1663 * writing routines will write directly to transmit FIFO.
1664 * Write buffer and counters protected by spinlocks 1664 * Write buffer and counters protected by spinlocks
1665 */ 1665 */
1666static void rp_put_char(struct tty_struct *tty, unsigned char ch) 1666static int rp_put_char(struct tty_struct *tty, unsigned char ch)
1667{ 1667{
1668 struct r_port *info = (struct r_port *) tty->driver_data; 1668 struct r_port *info = (struct r_port *) tty->driver_data;
1669 CHANNEL_t *cp; 1669 CHANNEL_t *cp;
1670 unsigned long flags; 1670 unsigned long flags;
1671 1671
1672 if (rocket_paranoia_check(info, "rp_put_char")) 1672 if (rocket_paranoia_check(info, "rp_put_char"))
1673 return; 1673 return 0;
1674 1674
1675 /* 1675 /*
1676 * Grab the port write mutex, locking out other processes that try to 1676 * Grab the port write mutex, locking out other processes that try to
@@ -1699,6 +1699,7 @@ static void rp_put_char(struct tty_struct *tty, unsigned char ch)
1699 } 1699 }
1700 spin_unlock_irqrestore(&info->slock, flags); 1700 spin_unlock_irqrestore(&info->slock, flags);
1701 mutex_unlock(&info->write_mtx); 1701 mutex_unlock(&info->write_mtx);
1702 return 1;
1702} 1703}
1703 1704
1704/* 1705/*