Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 291065
b: refs/heads/master
c: 8a7a3fd
h: refs/heads/master
i:
  291063: af45226
v: v3
  • Loading branch information
Marcel Holtmann authored and Johan Hedberg committed Feb 24, 2012
1 parent aec05cf commit 0892574
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a55e1f388767116836d32457a50eda7da3e925e5
refs/heads/master: 8a7a3fd680f3ea9f22fc504caf5e8e056a800401
5 changes: 5 additions & 0 deletions trunk/drivers/bluetooth/hci_ldisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,11 @@ static int hci_uart_register_dev(struct hci_uart *hu)
if (!test_bit(HCI_UART_RESET_ON_INIT, &hu->hdev_flags))
set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);

if (test_bit(HCI_UART_CREATE_AMP, &hu->hdev_flags))
hdev->dev_type = HCI_AMP;
else
hdev->dev_type = HCI_BREDR;

if (hci_register_dev(hdev) < 0) {
BT_ERR("Can't register HCI device");
hci_free_dev(hdev);
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/bluetooth/hci_uart.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@

#define HCI_UART_RAW_DEVICE 0
#define HCI_UART_RESET_ON_INIT 1
#define HCI_UART_CREATE_AMP 2

struct hci_uart;

Expand Down

0 comments on commit 0892574

Please sign in to comment.