commit 958533c044cd46fb737c548776aa497c21cc8623
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 10 12:03:56 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri Aug 10 12:03:56 2012 -0700
tree 45e51fdc1bff6e0a9a69e1edcb018e1ac8b19434
parent ea9ca88b7d4d291b309764729aa1018edfd3683b
parent 2e02b861173406a1287a53ca7b836a4ad5fd4255

Merge "Bluetooth: fix shutdown on SCO sockets" into msm-3.4

net/bluetooth/sco.c

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index f090a77..026ce5d 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -394,6 +394,15 @@
 
 	case BT_CONNECTED:
 	case BT_CONFIG:
+		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;
+		} else
+			sco_chan_del(sk, ECONNRESET);
+		break;
+
 	case BT_CONNECT:
 	case BT_DISCONN:
 		sco_chan_del(sk, ECONNRESET);
@@ -857,7 +866,9 @@
 		conn->sk = NULL;
 		sco_pi(sk)->conn = NULL;
 		sco_conn_unlock(conn);
-		hci_conn_put(conn->hcon);
+
+		if (conn->hcon)
+			hci_conn_put(conn->hcon);
 	}
 
 	sk->sk_state = BT_CLOSED;