diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-06 18:12:04 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-07 01:45:27 -0400 |
commit | 4f64fa807a9da14abfa329ae9f16c5ea11ef99ea (patch) | |
tree | 8b7906aaeeebb4771e6be5fe1d57e48be58e8c54 /drivers/bluetooth | |
parent | 74292d5ac289ff5ec8b565889aaeab332e709099 (diff) |
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.c | 8 |
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[] = { | |||
230 | { USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE }, | 230 | { USB_DEVICE(0x08fd, 0x0002), .driver_info = BTUSB_IGNORE }, |
231 | 231 | ||
232 | /* CSR BlueCore Bluetooth Sniffer */ | 232 | /* CSR BlueCore Bluetooth Sniffer */ |
233 | { USB_DEVICE(0x0a12, 0x0002), .driver_info = BTUSB_SNIFFER }, | 233 | { USB_DEVICE(0x0a12, 0x0002), |
234 | .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC }, | ||
234 | 235 | ||
235 | /* Frontline ComProbe Bluetooth Sniffer */ | 236 | /* Frontline ComProbe Bluetooth Sniffer */ |
236 | { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER }, | 237 | { USB_DEVICE(0x16d3, 0x0002), |
238 | .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC }, | ||
237 | 239 | ||
238 | /* Intel Bluetooth device */ | 240 | /* Intel Bluetooth device */ |
239 | { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, | 241 | { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, |
@@ -1804,8 +1806,6 @@ static int btusb_probe(struct usb_interface *intf, | |||
1804 | /* New sniffer firmware has crippled HCI interface */ | 1806 | /* New sniffer firmware has crippled HCI interface */ |
1805 | if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997) | 1807 | if (le16_to_cpu(udev->descriptor.bcdDevice) > 0x997) |
1806 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); | 1808 | set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks); |
1807 | |||
1808 | data->isoc = NULL; | ||
1809 | } | 1809 | } |
1810 | 1810 | ||
1811 | if (id->driver_info & BTUSB_INTEL_BOOT) { | 1811 | if (id->driver_info & BTUSB_INTEL_BOOT) { |