Commit 85689b24 authored Feb 23, 2015 by David S. Miller

bluetooth



Johan Hedberg says:

====================
pull request: bluetooth 2015-02-23

Here's one important fix for the 4.0-rc series. Refactoring of Intel
Bluetooth controller detection ended up disabling some older ones which
are based on CSR hardware. This patch re-introduces the necessary USB id
and fixes the breakage.

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents 6514890f 407550fe

drivers/bluetooth/btusb.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -272,6 +272,7 @@ static const struct usb_device_id blacklist_table[] = {
		{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },

		/* Intel Bluetooth devices */
		{ USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },
		{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },
		{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },
		{ USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW },

Admin message