summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-07-07 00:12:04 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2014-07-07 08:45:27 +0300
commit4f64fa807a9da14abfa329ae9f16c5ea11ef99ea (patch)
tree8b7906aaeeebb4771e6be5fe1d57e48be58e8c54 /drivers/bluetooth
parent74292d5ac289ff5ec8b565889aaeab332e709099 (diff)
downloadlinux-4f64fa807a9da14abfa329ae9f16c5ea11ef99ea.tar.gz
linux-4f64fa807a9da14abfa329ae9f16c5ea11ef99ea.tar.bz2
linux-4f64fa807a9da14abfa329ae9f16c5ea11ef99ea.zip
Bluetooth: Use BTUSB_BROKEN_ISOC flag for CSR USB sniffer devices
Instead of setting data->isoc manually, use BTUSB_BROKEN_ISOC to indicate that isochronous endpoints are not needed for CSR USB sniffer devices. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btusb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b7d0fed3417f..ef4375d5c4ed 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -230,10 +230,12 @@ static const struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE },
/* CSR BlueCore Bluetooth Sniffer */
- { USB_DEVICE(0x0a12, 0x0002), .driver_info = BTUSB_SNIFFER },
+ { USB_DEVICE(0x0a12, 0x0002),
+ .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC },
/* Frontline ComProbe Bluetooth Sniffer */
- { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
+ { USB_DEVICE(0x16d3, 0x0002),
+ .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC },
/* Intel Bluetooth device */
{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },
@@ -1804,8 +1806,6 @@ static int btusb_probe(struct usb_interface *intf,
/* New sniffer firmware has crippled HCI interface */
if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997)
set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
-
- data->isoc = NULL;
}
if (id->driver_info & BTUSB_INTEL_BOOT) {