diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2015-10-20 21:30:45 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-10-21 07:20:44 +0300 |
| commit | aee61f7aa89bbfa48b91628291d8685aa61c970f (patch) | |
| tree | 2b6ff4a1e18228791b30251c457d0ddf6f182f7c /drivers/bluetooth/hci_ldisc.c | |
| parent | 9f7378a9d6ced1784e08d3e21a9ddb769523baf2 (diff) | |
| download | talos-op-linux-aee61f7aa89bbfa48b91628291d8685aa61c970f.tar.gz talos-op-linux-aee61f7aa89bbfa48b91628291d8685aa61c970f.zip | |
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.c | 7 |
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) hdev->bus = HCI_UART; hci_set_drvdata(hdev, hu); + /* Only when vendor specific setup callback is provided, consider + * the manufacturer information valid. This avoids filling in the + * value for Ericsson when nothing is specified. + */ + if (hu->proto->setup) + hdev->manufacturer = hu->proto->manufacturer; + hdev->open = hci_uart_open; hdev->close = hci_uart_close; hdev->flush = hci_uart_flush; |
