Merge tag 'kvm-s390-master-4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / bluetooth / hci_ldisc.c

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 96bcec5598c221e4cec2841bbc4eb521d20778c1..73202624133b4e180a45c75f12ae329cc934bac0 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -162,7 +162,7 @@ restart:
                        break;
                }
 
-               hci_uart_tx_complete(hu, bt_cb(skb)->pkt_type);
+               hci_uart_tx_complete(hu, hci_skb_pkt_type(skb));
                kfree_skb(skb);
        }
 
@@ -248,7 +248,8 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
 {
        struct hci_uart *hu = hci_get_drvdata(hdev);
 
-       BT_DBG("%s: type %d len %d", hdev->name, bt_cb(skb)->pkt_type, skb->len);
+       BT_DBG("%s: type %d len %d", hdev->name, hci_skb_pkt_type(skb),
+              skb->len);
 
        hu->proto->enqueue(hu, skb);
 
@@ -461,13 +462,7 @@ static int hci_uart_tty_open(struct tty_struct *tty)
        INIT_WORK(&hu->init_ready, hci_uart_init_work);
        INIT_WORK(&hu->write_work, hci_uart_write_work);
 
-       /* Flush any pending characters in the driver and line discipline. */
-
-       /* FIXME: why is this needed. Note don't use ldisc_ref here as the
-          open path is before the ldisc is referencable */
-
-       if (tty->ldisc->ops->flush_buffer)
-               tty->ldisc->ops->flush_buffer(tty);
+       /* Flush any pending characters in the driver */
        tty_driver_flush_buffer(tty);
 
        return 0;