diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 11:54:08 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 19:29:46 +0400 |
commit | 5d19f546e7b6f0976f957780f2687c55668f4495 (patch) | |
tree | b2407e0a43d6d251d66aa88cf915facacee46f0b /drivers/char/vt.c | |
parent | 55da77899c1472d83452c914fa179d00ea96df65 (diff) | |
download | linux-5d19f546e7b6f0976f957780f2687c55668f4495.tar.xz |
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>
Diffstat (limited to 'drivers/char/vt.c')
-rw-r--r-- | drivers/char/vt.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |