leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consoles: switch to int put_char method

Browse Source 
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>
This commit is contained in:
Alan Cox 2008-04-30 00:54:08 -07:00 committed by Linus Torvalds
parent 55da77899c
commit 5d19f546e7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/viocons.c
View File

@ -628,13 +628,13 @@ static int viotty_write(struct tty_struct *tty, const unsigned char *buf,
/* /*
* TTY put_char method * 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; struct port_info *pi;
pi = get_port_data(tty); pi = get_port_data(tty);
if (pi == NULL) if (pi == NULL)
return; return 0;
/* This will append '\r' as well if the char is '\n' */ /* This will append '\r' as well if the char is '\n' */
if (viochar_is_console(pi)) 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)) if (viopath_isactive(pi->lp))
internal_write(pi, &ch, 1); internal_write(pi, &ch, 1);
return 1;
} }
/* /*

6
drivers/char/vt.c
View File

@ -2642,11 +2642,11 @@ static int con_write(struct tty_struct *tty, const unsigned char *buf, int count
return retval; 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()) if (in_interrupt())
return; /* n_r3964 calls put_char() from interrupt context */ return 0; /* n_r3964 calls put_char() from interrupt context */
do_con_write(tty, &ch, 1); return do_con_write(tty, &ch, 1);
} }
static int con_write_room(struct tty_struct *tty) static int con_write_room(struct tty_struct *tty)