Merge 4.5-rc4 into tty-next

We want the fixes in here, and this resolves a merge error in tty_io.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 2 deletions

diff --git a/net/irda/ircomm/ircomm_param.c b/net/irda/ircomm/ircomm_param.c
index 3c4caa60c926..5728e76ca6d5 100644
--- a/net/irda/ircomm/ircomm_param.c
+++ b/net/irda/ircomm/ircomm_param.c
@@ -134,11 +134,10 @@ int ircomm_param_request(struct ircomm_tty_cb *self, __u8 pi, int flush)
                 return -1;
         }
         skb_put(skb, count);
+        pr_debug("%s(), skb->len=%d\n", __func__, skb->len);
 
         spin_unlock_irqrestore(&self->spinlock, flags);
 
-        pr_debug("%s(), skb->len=%d\n", __func__ , skb->len);
-
         if (flush) {
                 /* ircomm_tty_do_softint will take care of the rest */
                 schedule_work(&self->tqueue);