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>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index b2753d79edcf7f2c34858ff65376733383fd0931..4f5b93568eccc71496e1a4aa1efd23e5d10017a3 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -259,14 +259,15 @@ static const struct usb_device_id blacklist_table[] = {
        { USB_DEVICE(0x16d3, 0x0002),
          .driver_info = BTUSB_SNIFFER | BTUSB_BROKEN_ISOC },
 
+       /* Marvell Bluetooth devices */
+       { USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
+       { USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
+
        /* Intel Bluetooth device */
        { 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 },
 
-       /* Marvell device */
-       { USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },
-       { USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
 
        { }     /* Terminating entry */
 };