From 7d0537d99e21cd038b361ddb5429f600944385a6 Mon Sep 17 00:00:00 2001
From: Peter Hurley <peter@hurleysoftware.com>
Date: Sun, 24 Jul 2011 00:10:46 -0400
Subject: [PATCH] --- yaml --- r: 263519 b: refs/heads/master c:
 9be4e3fbf2d3603e7a7010ede0697166738a788b h: refs/heads/master i:   263517:
 bf1417d9af6edbdfb5b5810644e732565d8161de   263515:
 64900d2d874262bbbd9944e5175e867719da5ce7   263511:
 141fd3717486822be8b6ddec0f3d1f881a064ce1   263503:
 2063d2ebb02c3978d9331fbca302a24aec7c1824   263487:
 4daff1f91d40d5a7c6c8ea7214f1efc5274b7398 v: v3

---
 [refs]                             | 2 +-
 trunk/net/bluetooth/af_bluetooth.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6ab91d50fd9e..e4523eab2b8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 950e2d51e866623e4c360280aa63b85ab66d3403
+refs/heads/master: 9be4e3fbf2d3603e7a7010ede0697166738a788b
diff --git a/trunk/net/bluetooth/af_bluetooth.c b/trunk/net/bluetooth/af_bluetooth.c
index 8add9b499912..117e0d161780 100644
--- a/trunk/net/bluetooth/af_bluetooth.c
+++ b/trunk/net/bluetooth/af_bluetooth.c
@@ -494,9 +494,8 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo)
 	BT_DBG("sk %p", sk);
 
 	add_wait_queue(sk_sleep(sk), &wait);
+	set_current_state(TASK_INTERRUPTIBLE);
 	while (sk->sk_state != state) {
-		set_current_state(TASK_INTERRUPTIBLE);
-
 		if (!timeo) {
 			err = -EINPROGRESS;
 			break;
@@ -510,12 +509,13 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo)
 		release_sock(sk);
 		timeo = schedule_timeout(timeo);
 		lock_sock(sk);
+		set_current_state(TASK_INTERRUPTIBLE);
 
 		err = sock_error(sk);
 		if (err)
 			break;
 	}
-	set_current_state(TASK_RUNNING);
+	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(sk_sleep(sk), &wait);
 	return err;
 }