diff options
-rw-r--r-- | drivers/char/viocons.c | 5 | ||||
-rw-r--r-- | drivers/char/vt.c | 6 |
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, | |||
628 | /* | 628 | /* |
629 | * TTY put_char method | 629 | * TTY put_char method |
630 | */ | 630 | */ |
631 | static void viotty_put_char(struct tty_struct *tty, unsigned char ch) | 631 | static int viotty_put_char(struct tty_struct *tty, unsigned char ch) |
632 | { | 632 | { |
633 | struct port_info *pi; | 633 | struct port_info *pi; |
634 | 634 | ||
635 | pi = get_port_data(tty); | 635 | pi = get_port_data(tty); |
636 | if (pi == NULL) | 636 | if (pi == NULL) |
637 | return; | 637 | return 0; |
638 | 638 | ||
639 | /* This will append '\r' as well if the char is '\n' */ | 639 | /* This will append '\r' as well if the char is '\n' */ |
640 | if (viochar_is_console(pi)) | 640 | if (viochar_is_console(pi)) |
@@ -642,6 +642,7 @@ static void viotty_put_char(struct tty_struct *tty, unsigned char ch) | |||
642 | 642 | ||
643 | if (viopath_isactive(pi->lp)) | 643 | if (viopath_isactive(pi->lp)) |
644 | internal_write(pi, &ch, 1); | 644 | internal_write(pi, &ch, 1); |
645 | return 1; | ||
645 | } | 646 | } |
646 | 647 | ||
647 | /* | 648 | /* |
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 | |||
2642 | return retval; | 2642 | return retval; |
2643 | } | 2643 | } |
2644 | 2644 | ||
2645 | static void con_put_char(struct tty_struct *tty, unsigned char ch) | 2645 | static int con_put_char(struct tty_struct *tty, unsigned char ch) |
2646 | { | 2646 | { |
2647 | if (in_interrupt()) | 2647 | if (in_interrupt()) |
2648 | return; /* n_r3964 calls put_char() from interrupt context */ | 2648 | return 0; /* n_r3964 calls put_char() from interrupt context */ |
2649 | do_con_write(tty, &ch, 1); | 2649 | return do_con_write(tty, &ch, 1); |
2650 | } | 2650 | } |
2651 | 2651 | ||
2652 | static int con_write_room(struct tty_struct *tty) | 2652 | static int con_write_room(struct tty_struct *tty) |