1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index e5680fa173c2..46640e98fa03 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -101,16 +101,16 @@ static const struct usb_device_id btusb_table[] = {
         { USB_DEVICE(0x0c10, 0x0000) },
 
         /* Broadcom BCM20702A0 */
+        { USB_DEVICE(0x0489, 0xe042) },
+        { USB_DEVICE(0x04ca, 0x2003) },
         { USB_DEVICE(0x0b05, 0x17b5) },
         { USB_DEVICE(0x0b05, 0x17cb) },
-        { USB_DEVICE(0x04ca, 0x2003) },
-        { USB_DEVICE(0x0489, 0xe042) },
         { USB_DEVICE(0x413c, 0x8197) },
 
         /* Foxconn - Hon Hai */
         { USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },
 
-        /*Broadcom devices with vendor specific id */
+        /* Broadcom devices with vendor specific id */
         { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
 
         /* Belkin F8065bf - Broadcom based */
@@ -132,57 +132,57 @@ static const struct usb_device_id blacklist_table[] = {
         { USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },
 
         /* Atheros 3011 with sflash firmware */
+        { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
+        { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
+        { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
         { USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
         { USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE },
         { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
-        { USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE },
-        { USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE },
-        { USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE },
 
         /* Atheros AR9285 Malbec with sflash firmware */
         { USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
 
         /* Atheros 3012 with sflash firmware */
+        { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 },
-        { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 },
 
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
 
         /* Atheros AR5BBU12 with sflash firmware */
-        { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
         { USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 },
+        { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
 
         /* Broadcom BCM2035 */
-        { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
-        { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
         { USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 },
+        { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
+        { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
 
         /* Broadcom BCM2045 */
         { USB_DEVICE(0x0a5c, 0x2039), .driver_info = BTUSB_WRONG_SCO_MTU },