1 files changed, 2 insertions, 3 deletions

diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index ea616e3fc98e..fb031fe9be9e 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);