projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing/hw-breakpoints' into perf/core
[linux-2.6-block.git]
/
drivers
/
bluetooth
/
btusb.c
diff --git
a/drivers/bluetooth/btusb.c
b/drivers/bluetooth/btusb.c
index 7ba91aa3fe8b8898cad41d96f35f1bd9bf221f3b..2fb38027f3bb8773da3d380c8322cbb947c2ea57 100644
(file)
--- a/
drivers/bluetooth/btusb.c
+++ b/
drivers/bluetooth/btusb.c
@@
-591,6
+591,7
@@
static int btusb_close(struct hci_dev *hdev)
return 0;
cancel_work_sync(&data->work);
+ cancel_work_sync(&data->waker);
clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
clear_bit(BTUSB_BULK_RUNNING, &data->flags);