diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-17 12:07:44 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-17 12:07:44 -0500 |
| commit | 811477de5f6d65baea69f25cb5528d428b82cc9c (patch) | |
| tree | f3c4245199b08f3f5729e46ac02aa4beb92156bb /net/bluetooth/sco.c | |
| parent | fa1e492aa3cbafba9f8fc6d05e5b08a3091daf4a (diff) | |
| parent | 4668cce527acb3bd048c5e6c99b157a14b214671 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 531a93d613d..57f250c20e3 100644 --- a/net/bluetooth/sco.c +++ b/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); |