diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /net/bluetooth_mgmt/af_bluetooth.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'net/bluetooth_mgmt/af_bluetooth.c')
| -rw-r--r-- | net/bluetooth_mgmt/af_bluetooth.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth_mgmt/af_bluetooth.c b/net/bluetooth_mgmt/af_bluetooth.c index 7c73a10..c3afcd2 100644 --- a/net/bluetooth_mgmt/af_bluetooth.c +++ b/net/bluetooth_mgmt/af_bluetooth.c @@ -224,8 +224,10 @@ void bt_accept_unlink(struct sock *sk) BT_DBG("sk %p state %d", sk, sk->sk_state); list_del_init(&bt_sk(sk)->accept_q); - bt_sk(sk)->parent->sk_ack_backlog--; - bt_sk(sk)->parent = NULL; + if (bt_sk(sk)->parent != NULL) { + bt_sk(sk)->parent->sk_ack_backlog--; + bt_sk(sk)->parent = NULL; + } sock_put(sk); } EXPORT_SYMBOL(bt_accept_unlink); |