diff options
| author | Michal Ostrowski <mostrows@watson.ibm.com> | 2005-07-14 16:46:26 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-08-05 00:04:15 -0700 |
| commit | e0b02eec6f8371d993c4aca134d728d3510f7c8a (patch) | |
| tree | 206fca2f99250a7f834802efee490c7db0ccedf9 | |
| parent | 50eb930a92e7070f6a110789245398bff4061059 (diff) | |
[PATCH] rocket.c: Fix ldisc ref count handling
If bailing out because there is nothing to receive in rp_do_receive(),
tty_ldisc_deref is not called. Failure to do so increases the ref count=20
and causes release_dev() to hang since it can't get the ref count to 0.
Signed-off-by: Michal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/char/rocket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 5bcbeb0cb9a..60882ec1698 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -277,7 +277,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 @@ -359,6 +359,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); } |