X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fbluetooth%2Faf_bluetooth.c;h=fb031fe9be9ed140bce6fdfe6092f3ab6df8ff87;hb=489447380a2921ec0e9154f773c44ab3167ede4b;hp=ea616e3fc98e73f3806a5dc04e9770b6fba38425;hpb=2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc;p=linux-2.6

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index ea616e3fc9..fb031fe9be 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -287,10 +287,9 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo)
 		timeo = schedule_timeout(timeo);
 		lock_sock(sk);
 
-		if (sk->sk_err) {
-			err = sock_error(sk);
+		err = sock_error(sk);
+		if (err)
 			break;
-		}
 	}
 	set_current_state(TASK_RUNNING);
 	remove_wait_queue(sk->sk_sleep, &wait);