aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/rfcomm/tty.c5
-rw-r--r--net/irda/ircomm/ircomm_tty.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index bd6fd0f43d2b..cbec3b642871 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -556,7 +556,7 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb)
556 556
557 BT_DBG("dlc %p tty %p len %d", dlc, tty, skb->len); 557 BT_DBG("dlc %p tty %p len %d", dlc, tty, skb->len);
558 558
559 tty_insert_flip_string(tty, skb->data, skb->len); 559 tty_insert_flip_string(&dev->port, skb->data, skb->len);
560 tty_flip_buffer_push(tty); 560 tty_flip_buffer_push(tty);
561 561
562 kfree_skb(skb); 562 kfree_skb(skb);
@@ -633,7 +633,8 @@ static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
633 rfcomm_dlc_lock(dev->dlc); 633 rfcomm_dlc_lock(dev->dlc);
634 634
635 while ((skb = skb_dequeue(&dev->pending))) { 635 while ((skb = skb_dequeue(&dev->pending))) {
636 inserted += tty_insert_flip_string(tty, skb->data, skb->len); 636 inserted += tty_insert_flip_string(&dev->port, skb->data,
637 skb->len);
637 kfree_skb(skb); 638 kfree_skb(skb);
638 } 639 }
639 640
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index a68c88cdec6e..14b08e376f9f 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -1141,7 +1141,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
1141 * Use flip buffer functions since the code may be called from interrupt 1141 * Use flip buffer functions since the code may be called from interrupt
1142 * context 1142 * context
1143 */ 1143 */
1144 tty_insert_flip_string(tty, skb->data, skb->len); 1144 tty_insert_flip_string(&self->port, skb->data, skb->len);
1145 tty_flip_buffer_push(tty); 1145 tty_flip_buffer_push(tty);
1146 tty_kref_put(tty); 1146 tty_kref_put(tty);
1147 1147