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;