diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /net/bluetooth/hci_core.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 8b602d881fd..9c4541bc488 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -1011,6 +1011,10 @@ int hci_unregister_dev(struct hci_dev *hdev) | |||
| 1011 | 1011 | ||
| 1012 | destroy_workqueue(hdev->workqueue); | 1012 | destroy_workqueue(hdev->workqueue); |
| 1013 | 1013 | ||
| 1014 | hci_dev_lock_bh(hdev); | ||
| 1015 | hci_blacklist_clear(hdev); | ||
| 1016 | hci_dev_unlock_bh(hdev); | ||
| 1017 | |||
| 1014 | __hci_dev_put(hdev); | 1018 | __hci_dev_put(hdev); |
| 1015 | 1019 | ||
| 1016 | return 0; | 1020 | return 0; |