From 6d9a6cc56bfd41c6723eba38c891a851b9fae879 Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Thu, 3 Jan 2013 19:59:28 -0200
Subject: [PATCH] --- yaml --- r: 349212 b: refs/heads/master c:
 b7e98b5100aad9290d7f06fcb9d1e80f7f62f05f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 40f905f879c0..59616efb8f17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b064edae38d62d8587a8c574f93b53ce75ae749
+refs/heads/master: b7e98b5100aad9290d7f06fcb9d1e80f7f62f05f
diff --git a/trunk/net/bluetooth/sco.c b/trunk/net/bluetooth/sco.c
index 531a93d613d4..57f250c20e39 100644
--- a/trunk/net/bluetooth/sco.c
+++ b/trunk/net/bluetooth/sco.c
@@ -352,7 +352,7 @@ static void __sco_sock_close(struct sock *sk)
 
 	case BT_CONNECTED:
 	case BT_CONFIG:
-		if (sco_pi(sk)->conn) {
+		if (sco_pi(sk)->conn->hcon) {
 			sk->sk_state = BT_DISCONN;
 			sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT);
 			hci_conn_put(sco_pi(sk)->conn->hcon);