Merge "Bluetooth: Resolved a race condition"

This commit is contained in:
Linux Build Service Account
2012-12-13 09:57:06 -08:00
committed by Gerrit - the friendly Code Review server
+4 -2
View File
@@ -397,8 +397,10 @@ static void __sco_sock_close(struct sock *sk)
if (sco_pi(sk)->conn) {
sk->sk_state = BT_DISCONN;
sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
hci_conn_put(sco_pi(sk)->conn->hcon);
sco_pi(sk)->conn->hcon = NULL;
if (sco_pi(sk)->conn->hcon != NULL) {
hci_conn_put(sco_pi(sk)->conn->hcon);
sco_pi(sk)->conn->hcon = NULL;
}
} else
sco_chan_del(sk, ECONNRESET);
break;