Bluetooth: btusb: Set early vendor info for Intel and Broadcom
authorMarcel Holtmann <marcel@holtmann.org>
Tue, 20 Oct 2015 00:30:48 +0000 (02:30 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 20 Oct 2015 22:49:23 +0000 (00:49 +0200)
For the controllers from Intel and Broadcom (including Apple), it is
helpful to have the information about the manufacturer send out early.

This patch sets the hdev->manufacturer information which will be send
out before actually calling the vendor specific hdev->setup driver
callback.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
drivers/bluetooth/btusb.c

index c064bb9..9ed334d 100644 (file)
@@ -2874,6 +2874,7 @@ static int btusb_probe(struct usb_interface *intf,
 
 #ifdef CONFIG_BT_HCIBTUSB_BCM
        if (id->driver_info & BTUSB_BCM_PATCHRAM) {
+               hdev->manufacturer = 15;
                hdev->setup = btbcm_setup_patchram;
                hdev->set_diag = btusb_bcm_set_diag;
                hdev->set_bdaddr = btbcm_set_bdaddr;
@@ -2883,6 +2884,7 @@ static int btusb_probe(struct usb_interface *intf,
        }
 
        if (id->driver_info & BTUSB_BCM_APPLE) {
+               hdev->manufacturer = 15;
                hdev->setup = btbcm_setup_apple;
                hdev->set_diag = btusb_bcm_set_diag;
 
@@ -2892,6 +2894,7 @@ static int btusb_probe(struct usb_interface *intf,
 #endif
 
        if (id->driver_info & BTUSB_INTEL) {
+               hdev->manufacturer = 2;
                hdev->setup = btusb_setup_intel;
                hdev->shutdown = btusb_shutdown_intel;
                hdev->set_diag = btintel_set_diag_mfg;
@@ -2902,6 +2905,7 @@ static int btusb_probe(struct usb_interface *intf,
        }
 
        if (id->driver_info & BTUSB_INTEL_NEW) {
+               hdev->manufacturer = 2;
                hdev->send = btusb_send_frame_intel;
                hdev->setup = btusb_setup_intel_new;
                hdev->hw_error = btintel_hw_error;