From 359f6bb83a67c8dd51ccad50f072a28a5e958e48 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:54:05 -0700 Subject: [PATCH] --- yaml --- r: 95224 b: refs/heads/master c: bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/riscom8.c | 9 ++++++--- trunk/drivers/char/rocket.c | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 156efc7289e0..45fe99850b0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7e752e2757fba49178f4b1af4778ca64d305cbb +refs/heads/master: bbbbb96f5ea84971545ecae5a9ec50387cd9c6a3 diff --git a/trunk/drivers/char/riscom8.c b/trunk/drivers/char/riscom8.c index a82c2a2d5e6c..221b5a292076 100644 --- a/trunk/drivers/char/riscom8.c +++ b/trunk/drivers/char/riscom8.c @@ -1161,16 +1161,17 @@ static int rc_write(struct tty_struct * tty, return total; } -static void rc_put_char(struct tty_struct * tty, unsigned char ch) +static int rc_put_char(struct tty_struct * tty, unsigned char ch) { struct riscom_port *port = (struct riscom_port *)tty->driver_data; unsigned long flags; + int ret = 0; if (rc_paranoia_check(port, tty->name, "rc_put_char")) - return; + return 0; if (!tty || !port->xmit_buf) - return; + return 0; spin_lock_irqsave(&riscom_lock, flags); @@ -1180,9 +1181,11 @@ static void rc_put_char(struct tty_struct * tty, unsigned char ch) port->xmit_buf[port->xmit_head++] = ch; port->xmit_head &= SERIAL_XMIT_SIZE - 1; port->xmit_cnt++; + ret = 1; out: spin_unlock_irqrestore(&riscom_lock, flags); + return ret; } static void rc_flush_chars(struct tty_struct * tty) diff --git a/trunk/drivers/char/rocket.c b/trunk/drivers/char/rocket.c index 00cfb6c7fd46..743dc80a9325 100644 --- a/trunk/drivers/char/rocket.c +++ b/trunk/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; } /*