Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d19f546 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

consoles: switch to int put_char method 



Signed-off-by: default avatarAlan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55da7789

drivers/char/viocons.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

}



/*

drivers/char/vt.c

+3 −3
Original line number Diff line number Diff line
@@ -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)