mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[BLUETOOTH]: l2cap info_timer delete fix in hci_conn_del
When the l2cap info_timer is active the info_state will be set to L2CAP_INFO_FEAT_MASK_REQ_SENT, and it will be unset after the timer is deleted or timeout triggered. Here in l2cap_conn_del only call del_timer_sync when the info_state is set to L2CAP_INFO_FEAT_MASK_REQ_SENT. Signed-off-by: Dave Young <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
7e36763b2c
commit
8e8440f535
1 changed files with 2 additions and 1 deletions
|
|
@ -417,7 +417,8 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
|
|||
l2cap_sock_kill(sk);
|
||||
}
|
||||
|
||||
del_timer_sync(&conn->info_timer);
|
||||
if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT)
|
||||
del_timer_sync(&conn->info_timer);
|
||||
|
||||
hcon->l2cap_data = NULL;
|
||||
kfree(conn);
|
||||
|
|
|
|||
Loading…
Reference in a new issue