DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Explicitly stop all timers before frees" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-01-14 18:24:57 -08:00
committed by QuIC Gerrit Code Review
parent b41f7473b0 3cd62049b5
commit 227ba22db9
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/bluetooth/hci_conn.c
View File

@@ -1,6 +1,6 @@
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (c) 2000-2001, 2010-2011 Code Aurora Forum. All rights reserved.
Copyright (c) 2000-2001, 2010-2012 Code Aurora Forum. All rights reserved.
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
@@ -430,9 +430,10 @@ int hci_conn_del(struct hci_conn *conn)
BT_DBG("%s conn %p handle %d", hdev->name, conn, conn->handle);
/* Make sure no timers are running */
del_timer(&conn->idle_timer);
del_timer(&conn->disc_timer);
del_timer(&conn->smp_timer);
if (conn->type == ACL_LINK) {
struct hci_conn *sco = conn->link;

6
net/bluetooth/hci_core.c
View File

@@ -1,6 +1,6 @@
/*
BlueZ - Bluetooth protocol stack for Linux
Copyright (c) 2000-2001, 2010-2011 Code Aurora Forum. All rights reserved.
Copyright (c) 2000-2001, 2010-2012 Code Aurora Forum. All rights reserved.
Written 2000,2001 by Maxim Krasnyansky <maxk@qualcomm.com>
@@ -1571,8 +1571,12 @@ int hci_unregister_dev(struct hci_dev *hdev)
hci_unregister_sysfs(hdev);
/* Disable all timers */
hci_del_off_timer(hdev);
del_timer(&hdev->adv_timer);
del_timer(&hdev->cmd_timer);
del_timer(&hdev->disc_timer);
del_timer(&hdev->disc_le_timer);
destroy_workqueue(hdev->workqueue);