vserver 1.9.3

[linux-2.6.git] / drivers / bluetooth / hci_ldisc.c

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 5ba1342..fb990ec 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -188,9 +188,7 @@ static int hci_uart_flush(struct hci_dev *hdev)
        }
 
        /* Flush any pending characters in the driver and discipline. */
-       if (tty->ldisc.flush_buffer)
-               tty->ldisc.flush_buffer(tty);
-
+       tty_ldisc_flush(tty);
        if (tty->driver->flush_buffer)
                tty->driver->flush_buffer(tty);
 
@@ -280,7 +278,9 @@ static int hci_uart_tty_open(struct tty_struct *tty)
 
        spin_lock_init(&hu->rx_lock);
 
-       /* Flush any pending characters in the driver and line discipline */
+       /* 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.flush_buffer)
                tty->ldisc.flush_buffer(tty);