aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/bluetooth/btusb.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 6f799c42cf2c..ce579d811ae4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -60,6 +60,7 @@ static struct usb_driver btusb_driver;
60#define BTUSB_QCA_ROME 0x8000 60#define BTUSB_QCA_ROME 0x8000
61#define BTUSB_BCM_APPLE 0x10000 61#define BTUSB_BCM_APPLE 0x10000
62#define BTUSB_REALTEK 0x20000 62#define BTUSB_REALTEK 0x20000
63#define BTUSB_BCM2045 0x40000
63 64
64static const struct usb_device_id btusb_table[] = { 65static const struct usb_device_id btusb_table[] = {
65 /* Generic Bluetooth USB device */ 66 /* Generic Bluetooth USB device */
@@ -164,6 +165,9 @@ static const struct usb_device_id blacklist_table[] = {
164 /* Broadcom BCM2033 without firmware */ 165 /* Broadcom BCM2033 without firmware */
165 { USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE }, 166 { USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },
166 167
168 /* Broadcom BCM2045 devices */
169 { USB_DEVICE(0x0a5c, 0x2045), .driver_info = BTUSB_BCM2045 },
170
167 /* Atheros 3011 with sflash firmware */ 171 /* Atheros 3011 with sflash firmware */
168 { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE }, 172 { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
169 { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE }, 173 { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
@@ -2857,6 +2861,9 @@ static int btusb_probe(struct usb_interface *intf,
2857 hdev->send = btusb_send_frame; 2861 hdev->send = btusb_send_frame;
2858 hdev->notify = btusb_notify; 2862 hdev->notify = btusb_notify;
2859 2863
2864 if (id->driver_info & BTUSB_BCM2045)
2865 set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &hdev->quirks);
2866
2860 if (id->driver_info & BTUSB_BCM92035) 2867 if (id->driver_info & BTUSB_BCM92035)
2861 hdev->setup = btusb_setup_bcm92035; 2868 hdev->setup = btusb_setup_bcm92035;
2862 2869