diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 16:17:10 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-01-31 16:17:10 -0500 |
| commit | a9037430c6c784165a940a90bcd29f886834c8e7 (patch) | |
| tree | 4b186e0a761e93a6c6712053d444b566c0d25338 /net/bluetooth/sco.c | |
| parent | 6125bc8b86d9da75ddac77e38f41afbf9f5de3e3 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
Merge branch 'timers/for-arm' into timers/core
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 531a93d613d4..57f250c20e39 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
| @@ -352,7 +352,7 @@ static void __sco_sock_close(struct sock *sk) | |||
| 352 | 352 | ||
| 353 | case BT_CONNECTED: | 353 | case BT_CONNECTED: |
| 354 | case BT_CONFIG: | 354 | case BT_CONFIG: |
| 355 | if (sco_pi(sk)->conn) { | 355 | if (sco_pi(sk)->conn->hcon) { |
| 356 | sk->sk_state = BT_DISCONN; | 356 | sk->sk_state = BT_DISCONN; |
| 357 | sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); | 357 | sco_sock_set_timer(sk, SCO_DISCONN_TIMEOUT); |
| 358 | hci_conn_put(sco_pi(sk)->conn->hcon); | 358 | hci_conn_put(sco_pi(sk)->conn->hcon); |