From 1c4405025d3da10998cc628755cd5aa57fd0cf69 Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
Date: Thu, 12 May 2011 11:13:15 +0300
Subject: [PATCH] --- yaml --- r: 255719 b: refs/heads/master c:
 4a77708b055a71bf769a917283a9eba3dcedb017 h: refs/heads/master i:   255717:
 7bfaeac57350e6a987814c30f1f35e9b43eb384b   255715:
 25b60db2317ff656c4244e6d78db33bd133bc5ba   255711:
 8764de69cd80993a349a6941fed6d07cda308b87 v: v3

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

diff --git a/[refs] b/[refs]
index 7cd877d89947..531afc24b89a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0fad89da9801b3945d2ee7243ecbc75b3da6f09
+refs/heads/master: 4a77708b055a71bf769a917283a9eba3dcedb017
diff --git a/trunk/net/bluetooth/sco.c b/trunk/net/bluetooth/sco.c
index 42fdffd1d76c..cb4fb7837e5c 100644
--- a/trunk/net/bluetooth/sco.c
+++ b/trunk/net/bluetooth/sco.c
@@ -369,6 +369,15 @@ static void __sco_sock_close(struct sock *sk)
 
 	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);
@@ -819,7 +828,9 @@ static void sco_chan_del(struct sock *sk, int err)
 		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;