diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-22 20:19:22 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-22 20:19:22 +0400 |
| commit | 1199992df2417dc9a1db1b19930ea4d0a697a61e (patch) | |
| tree | 4d0c187a1fe17e3f3745011c6fd2fa6c588e24d9 /net/bluetooth/hci_core.c | |
| parent | abef3bd71029b80ec1bdd6c6244b5b0b99f56633 (diff) | |
| parent | a7be50b7e30f9d77cb059a7ffdb781bb0fb92eba (diff) | |
| download | linux-1199992df2417dc9a1db1b19930ea4d0a697a61e.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index d4de5db18d5a..0b997c8f9655 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -734,6 +734,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) cancel_work_sync(&hdev->le_scan); + cancel_delayed_work(&hdev->power_off); + hci_req_cancel(hdev, ENODEV); hci_req_lock(hdev); |