X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fbluetooth%2Fhci_ldisc.c;h=96bcec5598c221e4cec2841bbc4eb521d20778c1;hb=8e483ed1342a4ea45b70f0f33ac54eff7a33d918;hp=01a83a3f8a1d1d603a93a1fd9810b61120438b9c;hpb=991659674288dba28c2f5a3d1a0133ef4d20824a;p=cascardo%2Flinux.git

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;