aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/hci_ldisc.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-10-20 15:30:45 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2015-10-21 00:20:44 -0400
commitaee61f7aa89bbfa48b91628291d8685aa61c970f (patch)
tree2b6ff4a1e18228791b30251c457d0ddf6f182f7c /drivers/bluetooth/hci_ldisc.c
parent9f7378a9d6ced1784e08d3e21a9ddb769523baf2 (diff)
Bluetooth: hci_uart: Provide initial manufacturer information
Provide an early indication about the manufacturer information so that it can be forwarded into monitor channel. 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.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 01a83a3f8a1d..96bcec5598c2 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -587,6 +587,13 @@ static int hci_uart_register_dev(struct hci_uart *hu)
587 hdev->bus = HCI_UART; 587 hdev->bus = HCI_UART;
588 hci_set_drvdata(hdev, hu); 588 hci_set_drvdata(hdev, hu);
589 589
590 /* Only when vendor specific setup callback is provided, consider
591 * the manufacturer information valid. This avoids filling in the
592 * value for Ericsson when nothing is specified.
593 */
594 if (hu->proto->setup)
595 hdev->manufacturer = hu->proto->manufacturer;
596
590 hdev->open = hci_uart_open; 597 hdev->open = hci_uart_open;
591 hdev->close = hci_uart_close; 598 hdev->close = hci_uart_close;
592 hdev->flush = hci_uart_flush; 599 hdev->flush = hci_uart_flush;