diff options
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/pdc_cons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/pdc_cons.c b/arch/parisc/kernel/pdc_cons.c index fc770be465ff..c1db65fc4525 100644 --- a/arch/parisc/kernel/pdc_cons.c +++ b/arch/parisc/kernel/pdc_cons.c | |||
@@ -103,7 +103,7 @@ static int pdc_console_tty_open(struct tty_struct *tty, struct file *filp) | |||
103 | static void pdc_console_tty_close(struct tty_struct *tty, struct file *filp) | 103 | static void pdc_console_tty_close(struct tty_struct *tty, struct file *filp) |
104 | { | 104 | { |
105 | if (!tty->count) | 105 | if (!tty->count) |
106 | del_timer(&pdc_console_timer); | 106 | del_timer_sync(&pdc_console_timer); |
107 | } | 107 | } |
108 | 108 | ||
109 | static int pdc_console_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) | 109 | static int pdc_console_tty_write(struct tty_struct *tty, const unsigned char *buf, int count) |
@@ -153,7 +153,7 @@ static void pdc_console_poll(unsigned long unused) | |||
153 | if (count) | 153 | if (count) |
154 | tty_flip_buffer_push(tty); | 154 | tty_flip_buffer_push(tty); |
155 | 155 | ||
156 | if (tty->count && (pdc_cons.flags & CON_ENABLED)) | 156 | if (pdc_cons.flags & CON_ENABLED) |
157 | mod_timer(&pdc_console_timer, jiffies + PDC_CONS_POLL_DELAY); | 157 | mod_timer(&pdc_console_timer, jiffies + PDC_CONS_POLL_DELAY); |
158 | } | 158 | } |
159 | 159 | ||