patch-2.4.26 linux-2.4.26/net/bluetooth/af_bluetooth.c

• Lines: 28
• Date: 2004-04-14 06:05:41.000000000 -0700
• Orig file: linux-2.4.25/net/bluetooth/af_bluetooth.c
• Orig date: 2003-08-25 04:44:44.000000000 -0700

diff -urN linux-2.4.25/net/bluetooth/af_bluetooth.c linux-2.4.26/net/bluetooth/af_bluetooth.c
@@ -221,12 +221,11 @@
 unsigned int bluez_sock_poll(struct file * file, struct socket *sock, poll_table *wait)
 {
 	struct sock *sk = sock->sk;
-	unsigned int mask;
+	unsigned int mask = 0;
 
 	BT_DBG("sock %p, sk %p", sock, sk);
 
 	poll_wait(file, sk->sleep, wait);
-	mask = 0;
 
 	if (sk->err || !skb_queue_empty(&sk->error_queue))
 		mask |= POLLERR;
@@ -242,9 +241,11 @@
 	if (sk->state == BT_CLOSED)
 		mask |= POLLHUP;
 
-	if (sk->state == BT_CONNECT || sk->state == BT_CONNECT2)
+	if (sk->state == BT_CONNECT ||
+			sk->state == BT_CONNECT2 ||
+			sk->state == BT_CONFIG)
 		return mask;
-	
+
 	if (sock_writeable(sk))
 		mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
 	else