aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/rfcomm/tty.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-07-11 12:43:11 -0400
committerTony Luck <tony.luck@intel.com>2005-07-11 12:43:11 -0400
commite7578c08a4dee36fe01fb38805f325689e642eb0 (patch)
tree7426054f6226aa2349ee0c0a3970aeef9276ea59 /net/bluetooth/rfcomm/tty.c
parent763b3917e779c9c25d56fc71a796774185cd6ce2 (diff)
parent5c23804a0941a111752fdacefe0bea2db1b4d93f (diff)
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/bluetooth/rfcomm/tty.c')
-rw-r--r--net/bluetooth/rfcomm/tty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 6d689200bcf3..6304590fd36a 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -781,7 +781,7 @@ static int rfcomm_tty_chars_in_buffer(struct tty_struct *tty)
781 781
782 BT_DBG("tty %p dev %p", tty, dev); 782 BT_DBG("tty %p dev %p", tty, dev);
783 783
784 if (skb_queue_len(&dlc->tx_queue)) 784 if (!skb_queue_empty(&dlc->tx_queue))
785 return dlc->mtu; 785 return dlc->mtu;
786 786
787 return 0; 787 return 0;