aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_ldisc.c6
-rw-r--r--drivers/bluetooth/hci_uart.h1
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index a49ee1b42439..401a3be57cda 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -431,6 +431,9 @@ static int hci_uart_register_dev(struct hci_uart *hu)
431 if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags)) 431 if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags))
432 set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); 432 set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
433 433
434 if (test_bit(HCI_UART_EXT_CONFIG, &hu->hdev_flags))
435 set_bit(HCI_QUIRK_EXTERNAL_CONFIG, &hdev->quirks);
436
434 if (!test_bit(HCI_UART_RESET_ON_INIT, &hu->hdev_flags)) 437 if (!test_bit(HCI_UART_RESET_ON_INIT, &hu->hdev_flags))
435 set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks); 438 set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);
436 439
@@ -482,7 +485,8 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags)
482 unsigned long valid_flags = BIT(HCI_UART_RAW_DEVICE) | 485 unsigned long valid_flags = BIT(HCI_UART_RAW_DEVICE) |
483 BIT(HCI_UART_RESET_ON_INIT) | 486 BIT(HCI_UART_RESET_ON_INIT) |
484 BIT(HCI_UART_CREATE_AMP) | 487 BIT(HCI_UART_CREATE_AMP) |
485 BIT(HCI_UART_INIT_PENDING); 488 BIT(HCI_UART_INIT_PENDING) |
489 BIT(HCI_UART_EXT_CONFIG);
486 490
487 if ((flags & ~valid_flags)) 491 if ((flags & ~valid_flags))
488 return -EINVAL; 492 return -EINVAL;
diff --git a/drivers/bluetooth/hci_uart.h b/drivers/bluetooth/hci_uart.h
index 12df101ca942..247488edcbf9 100644
--- a/drivers/bluetooth/hci_uart.h
+++ b/drivers/bluetooth/hci_uart.h
@@ -48,6 +48,7 @@
48#define HCI_UART_RESET_ON_INIT 1 48#define HCI_UART_RESET_ON_INIT 1
49#define HCI_UART_CREATE_AMP 2 49#define HCI_UART_CREATE_AMP 2
50#define HCI_UART_INIT_PENDING 3 50#define HCI_UART_INIT_PENDING 3
51#define HCI_UART_EXT_CONFIG 4
51 52
52struct hci_uart; 53struct hci_uart;
53 54