diff options
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/rocket.c | 3 | ||||
| -rw-r--r-- | drivers/char/vt.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index f463d6baa685..5b1d3680c8ab 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
| @@ -355,7 +355,7 @@ static void rp_do_receive(struct r_port *info, | |||
| 355 | ToRecv = space; | 355 | ToRecv = space; |
| 356 | 356 | ||
| 357 | if (ToRecv <= 0) | 357 | if (ToRecv <= 0) |
| 358 | return; | 358 | goto done; |
| 359 | 359 | ||
| 360 | /* | 360 | /* |
| 361 | * if status indicates there are errored characters in the | 361 | * if status indicates there are errored characters in the |
| @@ -437,6 +437,7 @@ static void rp_do_receive(struct r_port *info, | |||
| 437 | } | 437 | } |
| 438 | /* Push the data up to the tty layer */ | 438 | /* Push the data up to the tty layer */ |
| 439 | ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count); | 439 | ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count); |
| 440 | done: | ||
| 440 | tty_ldisc_deref(ld); | 441 | tty_ldisc_deref(ld); |
| 441 | } | 442 | } |
| 442 | 443 | ||
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index d7aa7a29f67e..30d96739fb23 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
| @@ -2796,7 +2796,7 @@ void do_blank_screen(int entering_gfx) | |||
| 2796 | return; | 2796 | return; |
| 2797 | 2797 | ||
| 2798 | if (vesa_off_interval) { | 2798 | if (vesa_off_interval) { |
| 2799 | blank_state = blank_vesa_wait, | 2799 | blank_state = blank_vesa_wait; |
| 2800 | mod_timer(&console_timer, jiffies + vesa_off_interval); | 2800 | mod_timer(&console_timer, jiffies + vesa_off_interval); |
| 2801 | } | 2801 | } |
| 2802 | 2802 | ||
