diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-20 21:47:07 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-20 21:47:07 -0300 |
| commit | 828d7d7b19446bf5a40928da47955c575a454c75 (patch) | |
| tree | fd006445c562749de9a07fe6e5363bab5d285a20 /net/bluetooth/hci_core.c | |
| parent | 26954c7f26068b6ced108806fdd39aee5cd54e6f (diff) | |
| parent | 069f40fc07f6df3da325e7ea1698a0d6247983d5 (diff) | |
| download | kernel_samsung_smdk4412-828d7d7b19446bf5a40928da47955c575a454c75.zip kernel_samsung_smdk4412-828d7d7b19446bf5a40928da47955c575a454c75.tar.gz kernel_samsung_smdk4412-828d7d7b19446bf5a40928da47955c575a454c75.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/l2cap_core.c
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index a80bc1c..98aa24b 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -590,6 +590,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) del_timer_sync(&hdev->cmd_timer); if (!test_and_clear_bit(HCI_UP, &hdev->flags)) { + del_timer_sync(&hdev->cmd_timer); hci_req_unlock(hdev); return 0; } |