diff options
author | David S. Miller <davem@davemloft.net> | 2011-04-22 13:21:38 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-22 13:21:38 -0700 |
commit | 1ed3aad141fe595673c20225a9e004730088be52 (patch) | |
tree | dec75e69b602e677ba0e5231f2d3036663fbd66a /net/bluetooth/hci_core.c | |
parent | f01cb5fbea1c1613621f9f32f385e12c1a29dde0 (diff) | |
parent | 069f40fc07f6df3da325e7ea1698a0d6247983d5 (diff) | |
download | kernel_samsung_espresso10-1ed3aad141fe595673c20225a9e004730088be52.zip kernel_samsung_espresso10-1ed3aad141fe595673c20225a9e004730088be52.tar.gz kernel_samsung_espresso10-1ed3aad141fe595673c20225a9e004730088be52.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/bluetooth/hci_core.c')
-rw-r--r-- | net/bluetooth/hci_core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index c83f618..b5a8afc 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -587,10 +587,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) hci_req_cancel(hdev, ENODEV); hci_req_lock(hdev); - /* Stop timer, it might be running */ - 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; } @@ -629,6 +627,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) /* Drop last sent command */ if (hdev->sent_cmd) { + del_timer_sync(&hdev->cmd_timer); kfree_skb(hdev->sent_cmd); hdev->sent_cmd = NULL; } |