diff --git a/[refs] b/[refs] index 188946a6d7b4..3060cc2c04c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f97933d0fd13920d7d53b6e0107bb674b3a1f0b +refs/heads/master: a1287ba1ba810aae1f8b81e32560d5d3bf3ff9f0 diff --git a/trunk/drivers/char/rocket.c b/trunk/drivers/char/rocket.c index f463d6baa685..5b1d3680c8ab 100644 --- a/trunk/drivers/char/rocket.c +++ b/trunk/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); }