diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-11 01:12:58 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-11 06:59:50 -0400 |
commit | 6afd04ad6b6608fe2d9abce120bd8c0bc6aba287 (patch) | |
tree | ea6db944fcaa7b9e1c01bfaa06f93b232ed031e6 /drivers/bluetooth/hci_ldisc.c | |
parent | bb72bd68fd87a4347b2a891ab16aac6014e69a00 (diff) |
Bluetooth: Add support for external configuration with UART driver
The quirk for enabling external configuration with UART needs to be
provided via the HCI UART flags. Add a new flag for it and declare
it as valid.
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.c | 6 |
1 files changed, 5 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; |