[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: Michal Ostrowski <mostrows@watson.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
6f97933d0f
commit
a1287ba1ba
|
@ -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,
|
||||||
}
|
}
|
||||||
/* 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue