Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index f463d6baa685..5b1d3680c8ab 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);
 }