aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-07-06 14:53:55 +0200
committerBen Hutchings <ben@decadent.org.uk>2015-02-20 00:49:27 +0000
commitda4710d452087ab60f408b99b99b0ae4f432e2a6 (patch)
treed52a9d1fee74f55ee76f84715b8777d78a06f2f6 /drivers/bluetooth
parentbb6bdd59efaa9742d2d13ae7f4efe1f1d5050740 (diff)
downloadkernel_samsung_smdk4412-da4710d452087ab60f408b99b99b0ae4f432e2a6.zip
kernel_samsung_smdk4412-da4710d452087ab60f408b99b99b0ae4f432e2a6.tar.gz
kernel_samsung_smdk4412-da4710d452087ab60f408b99b99b0ae4f432e2a6.tar.bz2
Bluetooth: Ignore isochronous endpoints for Intel USB bootloader
commit d92f2df0565ea04101d6ac04bdc10feeb1d93c94 upstream. The isochronous endpoints are not valid when the Intel Bluetooth controller boots up in bootloader mode. So just mark these endpoints as broken and then they will not be configured. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btusb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 8ed3c6c..6472ab8 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -127,7 +127,8 @@ static struct usb_device_id btusb_table[] = {
{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) },
/* Intel Bluetooth USB Bootloader (RAM module) */
- { USB_DEVICE(0x8087, 0x0a5a), .driver_info = BTUSB_INTEL_BOOT },
+ { USB_DEVICE(0x8087, 0x0a5a),
+ .driver_info = BTUSB_INTEL_BOOT | BTUSB_BROKEN_ISOC },
{ } /* Terminating entry */
};