From 69c7b769de22bee5901f9807aa7ea3a732f5f0dd Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Nov 2009 13:32:29 -0800
Subject: [PATCH] --- yaml --- r: 168545 b: refs/heads/master c:
 404291ac9e72d118fcadeb939a69b2caa0a0e9ca h: refs/heads/master i:   168543:
 00505fd7fbb42d0cf6c3fb4f4d3ab16851533153 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/bluetooth/btusb.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 40e7499c2666..8a125bf2f4ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd801452a30927ec0dff84e541191e611c1afd0c
+refs/heads/master: 404291ac9e72d118fcadeb939a69b2caa0a0e9ca
diff --git a/trunk/drivers/bluetooth/btusb.c b/trunk/drivers/bluetooth/btusb.c
index 7ba91aa3fe8b..2fb38027f3bb 100644
--- a/trunk/drivers/bluetooth/btusb.c
+++ b/trunk/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);