diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2015-01-28 22:41:42 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-01-29 01:24:12 -0500 |
commit | cb1ee89f95ce8d5294bde33447d6ccab582c1999 (patch) | |
tree | caea8439a56babdfd7e26389a758a3098343f09b /drivers/bluetooth/btusb.c | |
parent | 64dae967cac7e5e9a685aa79eee470b77a80acd0 (diff) |
Bluetooth: btusb: Sort USB_DEVICE entries for Marvell by vendor id
New entries to the USB blacklist/quirk device table should be sorted
by USB vendor id. Fix the recent entry fro Marvell devices.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r-- | drivers/bluetooth/btusb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index b2753d79edcf..4f5b93568ecc 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -259,14 +259,15 @@ static const struct usb_device_id blacklist_table[] = { | |||
259 | { USB_DEVICE(0x16d3, 0x0002), | 259 | { USB_DEVICE(0x16d3, 0x0002), |
260 | .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC }, | 260 | .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC }, |
261 | 261 | ||
262 | /* Marvell Bluetooth devices */ | ||
263 | { USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL }, | ||
264 | { USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL }, | ||
265 | |||
262 | /* Intel Bluetooth device */ | 266 | /* Intel Bluetooth device */ |
263 | { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, | 267 | { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, |
264 | { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL }, | 268 | { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL }, |
265 | { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW }, | 269 | { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_NEW }, |
266 | 270 | ||
267 | /* Marvell device */ | ||
268 | { USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL }, | ||
269 | { USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL }, | ||
270 | 271 | ||
271 | { } /* Terminating entry */ | 272 | { } /* Terminating entry */ |
272 | }; | 273 | }; |