diff options
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 | |||
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) |