diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 00:54:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 08:29:46 -0700 |
| commit | bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3 (patch) | |
| tree | 91ccad37c7f12a264e49c204989f214c26b87b95 /drivers/char/rocket.c | |
| parent | d7e752e2757fba49178f4b1af4778ca64d305cbb (diff) | |
| download | op-kernel-dev-bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3.zip op-kernel-dev-bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3.tar.gz | |
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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 00cfb6c..743dc80 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -1663,14 +1663,14 @@ static void rp_hangup(struct tty_struct *tty) * writing routines will write directly to transmit FIFO. * Write buffer and counters protected by spinlocks */ -static void rp_put_char(struct tty_struct *tty, unsigned char ch) +static int rp_put_char(struct tty_struct *tty, unsigned char ch) { struct r_port *info = (struct r_port *) tty->driver_data; CHANNEL_t *cp; unsigned long flags; if (rocket_paranoia_check(info, "rp_put_char")) - return; + return 0; /* * 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) } spin_unlock_irqrestore(&info->slock, flags); mutex_unlock(&info->write_mtx); + return 1; } /* |
