summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 00:54:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 08:29:46 -0700
commit5d19f546e7b6f0976f957780f2687c55668f4495 (patch)
treeb2407e0a43d6d251d66aa88cf915facacee46f0b
parent55da77899c1472d83452c914fa179d00ea96df65 (diff)
downloadlinux-stable-5d19f546e7b6f0976f957780f2687c55668f4495.tar.gz
linux-stable-5d19f546e7b6f0976f957780f2687c55668f4495.tar.bz2
linux-stable-5d19f546e7b6f0976f957780f2687c55668f4495.zip
consoles: switch to int put_char method
Signed-off-by: Alan Cox <alan@redhat.com> Cc: Antonino Daplas <adaplas@pol.net> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Kelly Daly <kelly@au.ibm.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Jiri Slaby <jirislaby@gmail.com> Cc: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/viocons.c5
-rw-r--r--drivers/char/vt.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 9319c63dda9a..3d3e1c2b310f 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -628,13 +628,13 @@ static int viotty_write(struct tty_struct *tty, const unsigned char *buf,
/*
* TTY put_char method
*/
-static void viotty_put_char(struct tty_struct *tty, unsigned char ch)
+static int viotty_put_char(struct tty_struct *tty, unsigned char ch)
{
struct port_info *pi;
pi = get_port_data(tty);
if (pi == NULL)
- return;
+ return 0;
/* This will append '\r' as well if the char is '\n' */
if (viochar_is_console(pi))
@@ -642,6 +642,7 @@ static void viotty_put_char(struct tty_struct *tty, unsigned char ch)
if (viopath_isactive(pi->lp))
internal_write(pi, &ch, 1);
+ return 1;
}
/*
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index c71d1d0f13b9..71cf203d282d 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -2642,11 +2642,11 @@ static int con_write(struct tty_struct *tty, const unsigned char *buf, int count
return retval;
}
-static void con_put_char(struct tty_struct *tty, unsigned char ch)
+static int con_put_char(struct tty_struct *tty, unsigned char ch)
{
if (in_interrupt())
- return; /* n_r3964 calls put_char() from interrupt context */
- do_con_write(tty, &ch, 1);
+ return 0; /* n_r3964 calls put_char() from interrupt context */
+ return do_con_write(tty, &ch, 1);
}
static int con_write_room(struct tty_struct *tty)