---

yaml --- r: 323168 b: refs/heads/master c: 78c04c0 h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · 1b3fb17 · 1b3fb17
1 parent abb72ff
commit 1b3fb17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aad3d0e343900a4c2c5dbc73f76550aa64a0ac1b
+refs/heads/master: 78c04c0bf52360dc2f7185e99c8e9aa05d73ae5a
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/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);