X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=drivers%2Fchar%2Fn_tty.c;h=4e28b35024ece708161ec948f37b926fc8455c1b;hp=ff47907ff1bf9f9ae8ddc3e073c06ae4f3a615df;hb=535e0c1726bec699a8f0f5b86fe7d399546b2555;hpb=402168cee1a0b791c54c54a68ae21bb26880f40b

diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index ff47907ff1bf..4e28b35024ec 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -300,8 +300,7 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
 			if (space < 2)
 				return -1;
 			tty->canon_column = tty->column = 0;
-			tty_put_char(tty, '\r');
-			tty_put_char(tty, c);
+			tty->ops->write(tty, "\r\n", 2);
 			return 2;
 		}
 		tty->canon_column = tty->column;
@@ -1583,6 +1582,7 @@ static int n_tty_open(struct tty_struct *tty)
 
 static inline int input_available_p(struct tty_struct *tty, int amt)
 {
+	tty_flush_to_ldisc(tty);
 	if (tty->icanon) {
 		if (tty->canon_data)
 			return 1;