From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 31 Jul 2013 19:11:50 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth... 
X-Git-Tag: v3.11-rc4~5^2~27^2^2~1
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=704278ccb5c9fcbe09d1be3657950c17fad18ba8

Merge branch 'master' of git://git./linux/kernel/git/bluetooth/bluetooth

Conflicts:
	net/bluetooth/hci_core.c
---

704278ccb5c9fcbe09d1be3657950c17fad18ba8
diff --cc net/bluetooth/hci_core.c
index e3a349977595,48e1e0438f3a..cc27297da5a9
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -2165,12 -2210,8 +2168,8 @@@ int hci_register_dev(struct hci_dev *hd
  
  	BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
  
- 	write_lock(&hci_dev_list_lock);
- 	list_add(&hdev->list, &hci_dev_list);
- 	write_unlock(&hci_dev_list_lock);
- 
 -	hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
 -					  WQ_MEM_RECLAIM, 1);
 +	hdev->workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND |
 +					  WQ_MEM_RECLAIM, 1, hdev->name);
  	if (!hdev->workqueue) {
  		error = -ENOMEM;
  		goto err;