summaryrefslogtreecommitdiff
path: root/drivers/bluetooth/hci_ldisc.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-04-06 10:52:14 +0300
committerMarcel Holtmann <marcel@holtmann.org>2015-04-07 19:48:21 +0300
commitbca03c959ab377010d87bef2679890a4a4e66e37 (patch)
tree2b56431b09bb0200c26a6912fad209b21801a0a1 /drivers/bluetooth/hci_ldisc.c
parent59a077c4792e2226b8a95430c0f17d1098939647 (diff)
downloadlinux-bca03c959ab377010d87bef2679890a4a4e66e37.tar.xz
Bluetooth: hci_uart: Use generic Intel support for address setting
The Bluetooth address setting for Intel devices is provided by a generic module now. Start using that module instead of relying it being included in the driver. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
-rw-r--r--drivers/bluetooth/hci_ldisc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index a106c3e201e3..5c9a73f02664 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -44,6 +44,7 @@
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
+#include "btintel.h"
#include "btbcm.h"
#include "hci_uart.h"
@@ -295,7 +296,8 @@ static int hci_uart_setup(struct hci_dev *hdev)
switch (le16_to_cpu(ver->manufacturer)) {
#ifdef CONFIG_BT_HCIUART_INTEL
case 2:
- hdev->set_bdaddr = intel_set_bdaddr;
+ hdev->set_bdaddr = btintel_set_bdaddr;
+ btintel_check_bdaddr(hdev);
break;
#endif
#ifdef CONFIG_BT_HCIUART_BCM