diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-15 16:59:00 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-15 16:59:00 -0700 |
| commit | 08848e446bcd2130c26945be966446389d25bcc2 (patch) | |
| tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /drivers/char | |
| parent | 46906c4415f88cebfad530917bada0835d651824 (diff) | |
| parent | 38d84c3bd6dd22bdb1f797c87006931133d71aea (diff) | |
| download | op-kernel-dev-08848e446bcd2130c26945be966446389d25bcc2.zip op-kernel-dev-08848e446bcd2130c26945be966446389d25bcc2.tar.gz | |
Auto merge with /home/aegl/GIT/linus
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 f463d6b..5b1d368 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -355,7 +355,7 @@ static void rp_do_receive(struct r_port *info, ToRecv = space; if (ToRecv <= 0) - return; + goto done; /* * if status indicates there are errored characters in the @@ -437,6 +437,7 @@ static void rp_do_receive(struct r_port *info, } /* Push the data up to the tty layer */ ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count); +done: tty_ldisc_deref(ld); } diff --git a/drivers/char/vt.c b/drivers/char/vt.c index d7aa7a2..30d9673 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -2796,7 +2796,7 @@ void do_blank_screen(int entering_gfx) return; if (vesa_off_interval) { - blank_state = blank_vesa_wait, + blank_state = blank_vesa_wait; mod_timer(&console_timer, jiffies + vesa_off_interval); } |
