4 files changed, 14 insertions, 18 deletions

diff --git a/net/bluetooth/rfcomm/Kconfig b/net/bluetooth/rfcomm/Kconfig
index 22e718b554e4..18d352ea2bc7 100644
--- a/net/bluetooth/rfcomm/Kconfig
+++ b/net/bluetooth/rfcomm/Kconfig
@@ -12,6 +12,7 @@ config BT_RFCOMM
 config BT_RFCOMM_TTY
         bool "RFCOMM TTY support"
         depends on BT_RFCOMM
+        depends on TTY
         help
           This option enables TTY emulation support for RFCOMM channels.
 
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index bd6fd0f43d2b..b6e44ad6cca6 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -541,23 +541,21 @@ int rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
 static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb)
 {
         struct rfcomm_dev *dev = dlc->owner;
-        struct tty_struct *tty;
 
         if (!dev) {
                 kfree_skb(skb);
                 return;
         }
 
-        tty = dev->port.tty;
-        if (!tty || !skb_queue_empty(&dev->pending)) {
+        if (!skb_queue_empty(&dev->pending)) {
                 skb_queue_tail(&dev->pending, skb);
                 return;
         }
 
-        BT_DBG("dlc %p tty %p len %d", dlc, tty, skb->len);
+        BT_DBG("dlc %p len %d", dlc, skb->len);
 
-        tty_insert_flip_string(tty, skb->data, skb->len);
-        tty_flip_buffer_push(tty);
+        tty_insert_flip_string(&dev->port, skb->data, skb->len);
+        tty_flip_buffer_push(&dev->port);
 
         kfree_skb(skb);
 }
@@ -621,26 +619,23 @@ static void rfcomm_dev_modem_status(struct rfcomm_dlc *dlc, u8 v24_sig)
 /* ---- TTY functions ---- */
 static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
 {
-        struct tty_struct *tty = dev->port.tty;
         struct sk_buff *skb;
         int inserted = 0;
 
-        if (!tty)
-                return;
-
-        BT_DBG("dev %p tty %p", dev, tty);
+        BT_DBG("dev %p", dev);
 
         rfcomm_dlc_lock(dev->dlc);
 
         while ((skb = skb_dequeue(&dev->pending))) {
-                inserted += tty_insert_flip_string(tty, skb->data, skb->len);
+                inserted += tty_insert_flip_string(&dev->port, skb->data,
+                                skb->len);
                 kfree_skb(skb);
         }
 
         rfcomm_dlc_unlock(dev->dlc);
 
         if (inserted > 0)
-                tty_flip_buffer_push(tty);
+                tty_flip_buffer_push(&dev->port);
 }
 
 static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
diff --git a/net/irda/ircomm/Kconfig b/net/irda/ircomm/Kconfig
index 2d4c6b4a78d6..19492c1707b7 100644
--- a/net/irda/ircomm/Kconfig
+++ b/net/irda/ircomm/Kconfig
@@ -1,6 +1,6 @@
 config IRCOMM
         tristate "IrCOMM protocol"
-        depends on IRDA
+        depends on IRDA && TTY
         help
           Say Y here if you want to build support for the IrCOMM protocol.
           To compile it as modules, choose M here: the modules will be
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index a68c88cdec6e..9a5fd3c3e530 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -452,7 +452,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
                    self->line, self->port.count);
 
         /* Not really used by us, but lets do it anyway */
-        tty->low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         /*
          * If the port is the middle of closing, bail out now
@@ -1136,14 +1136,14 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
                 ircomm_tty_send_initial_parameters(self);
                 ircomm_tty_link_established(self);
         }
+        tty_kref_put(tty);
 
         /*
          * Use flip buffer functions since the code may be called from interrupt
          * context
          */
-        tty_insert_flip_string(tty, skb->data, skb->len);
-        tty_flip_buffer_push(tty);
-        tty_kref_put(tty);
+        tty_insert_flip_string(&self->port, skb->data, skb->len);
+        tty_flip_buffer_push(&self->port);
 
         /* No need to kfree_skb - see ircomm_ttp_data_indication() */