Merge branch 'salted-string-hash'

[deliverable/linux.git] / drivers / bluetooth / btusb.c

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 880bb5546b25a0cd896a4db2a2dcfde49b2def81..811f9b97e360fa416d30a24d54a1b947d85d1512 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -237,6 +237,7 @@ static const struct usb_device_id blacklist_table[] = {
        { USB_DEVICE(0x13d3, 0x3472), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3474), .driver_info = BTUSB_ATH3012 },
        { USB_DEVICE(0x13d3, 0x3487), .driver_info = BTUSB_ATH3012 },
+       { USB_DEVICE(0x13d3, 0x3490), .driver_info = BTUSB_ATH3012 },
 
        /* Atheros AR5BBU12 with sflash firmware */
        { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -2832,7 +2833,7 @@ static int btusb_probe(struct usb_interface *intf,
        if (id->driver_info & BTUSB_AMP)
                hdev->dev_type = HCI_AMP;
        else
-               hdev->dev_type = HCI_BREDR;
+               hdev->dev_type = HCI_PRIMARY;
 
        data->hdev = hdev;