Commit a1287ba1 authored by Michal Ostrowski's avatar Michal Ostrowski Committed by Linus Torvalds

[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
and causes release_dev() to hang since it can't get the ref count to 0.
Signed-off-by: default avatarMichal Ostrowski <mostrows@watson.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6f97933d
...@@ -355,7 +355,7 @@ static void rp_do_receive(struct r_port *info, ...@@ -355,7 +355,7 @@ static void rp_do_receive(struct r_port *info,
ToRecv = space; ToRecv = space;
if (ToRecv <= 0) if (ToRecv <= 0)
return; goto done;
/* /*
* if status indicates there are errored characters in the * if status indicates there are errored characters in the
...@@ -437,6 +437,7 @@ static void rp_do_receive(struct r_port *info, ...@@ -437,6 +437,7 @@ static void rp_do_receive(struct r_port *info,
} }
/* Push the data up to the tty layer */ /* Push the data up to the tty layer */
ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count); ld->receive_buf(tty, tty->flip.char_buf, tty->flip.flag_buf, count);
done:
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment