Patch "Bluetooth: sort the list of IDs in the source code" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
Bluetooth: sort the list of IDs in the source code
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-sort-the-list-of-ids-in-the-source-code.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
0b8800623d3f12dd40a039aa191d52bfa4eef5b4Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <[email protected]>
Date: Tue, 18 Feb 2014 18:26:19 +0200
Subject: Bluetooth: sort the list of IDs in the source code
From: Andy Shevchenko <[email protected]>
commit 0b8800623d3f12dd40a039aa191d52bfa4eef5b4 upstream.
This will help to manage table of supported IDs.
There is no functional change.
Signed-off-by Andy Shevchenko <[email protected]>
Signed-off-by Marcel Holtmann <[email protected]>
[bwh: Backported to 3.14: sort 04ca:3007 which was added after this upstream
but already added here]
Signed-off-by Ben Hutchings <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- drivers/bluetooth/ath3k.c | 82 +++++++++++++++++++++++----------------------- drivers/bluetooth/btusb.c | 54 +++++++++++++++--------------- 2 files changed, 68 insertions(+), 68 deletions(-)
drivers/bluetooth/ath3k.c +41 -41
@@ -62,53 +62,53 @@ static const struct usb_device_id ath3k_ { USB_DEVICE(0x0CF3, 0x3000) },/* Atheros AR3011 with sflash firmware*/ + { USB_DEVICE(0x0489, 0xE027) }, + { USB_DEVICE(0x0489, 0xE03D) }, + { USB_DEVICE(0x0930, 0x0215) }, { USB_DEVICE(0x0CF3, 0x3002) }, { USB_DEVICE(0x0CF3, 0xE019) }, { USB_DEVICE(0x13d3, 0x3304) }, - { USB_DEVICE(0x0930, 0x0215) }, - { USB_DEVICE(0x0489, 0xE03D) }, - { USB_DEVICE(0x0489, 0xE027) },/* Atheros AR9285 Malbec with sflash firmware */ { USB_DEVICE(0x03F0, 0x311D) },/* Atheros AR3012 with sflash firmware*/ + { USB_DEVICE(0x0489, 0xe04d) }, + { USB_DEVICE(0x0489, 0xe04e) }, + { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x0489, 0xe056) }, + { USB_DEVICE(0x0489, 0xe05f) }, + { USB_DEVICE(0x04c5, 0x1330) }, + { USB_DEVICE(0x04CA, 0x3004) }, + { USB_DEVICE(0x04CA, 0x3005) }, + { USB_DEVICE(0x04CA, 0x3006) }, + { USB_DEVICE(0x04CA, 0x3007) }, + { USB_DEVICE(0x04CA, 0x3008) }, + { USB_DEVICE(0x04CA, 0x300b) }, + { USB_DEVICE(0x0930, 0x0219) }, + { USB_DEVICE(0x0930, 0x0220) }, { USB_DEVICE(0x0CF3, 0x0036) }, { USB_DEVICE(0x0CF3, 0x3004) }, { USB_DEVICE(0x0CF3, 0x3008) }, { USB_DEVICE(0x0CF3, 0x311D) }, { USB_DEVICE(0x0CF3, 0x311E) }, { USB_DEVICE(0x0CF3, 0x311F) }, + { USB_DEVICE(0x0cf3, 0x3121) }, { USB_DEVICE(0x0CF3, 0x817a) }, - { USB_DEVICE(0x13d3, 0x3375) }, - { USB_DEVICE(0x04CA, 0x3004) }, - { USB_DEVICE(0x04CA, 0x3005) }, - { USB_DEVICE(0x04CA, 0x3006) }, - { USB_DEVICE(0x04CA, 0x3007) }, - { USB_DEVICE(0x04CA, 0x3008) }, - { USB_DEVICE(0x04CA, 0x300b) }, - { USB_DEVICE(0x13d3, 0x3362) }, + { USB_DEVICE(0x0cf3, 0xe003) }, { USB_DEVICE(0x0CF3, 0xE004) }, { USB_DEVICE(0x0CF3, 0xE005) }, - { USB_DEVICE(0x0930, 0x0219) }, - { USB_DEVICE(0x0930, 0x0220) }, - { USB_DEVICE(0x0489, 0xe057) }, + { USB_DEVICE(0x13d3, 0x3362) }, + { USB_DEVICE(0x13d3, 0x3375) }, { USB_DEVICE(0x13d3, 0x3393) }, - { USB_DEVICE(0x0489, 0xe04e) }, - { USB_DEVICE(0x0489, 0xe056) }, - { USB_DEVICE(0x0489, 0xe04d) }, - { USB_DEVICE(0x04c5, 0x1330) }, { USB_DEVICE(0x13d3, 0x3402) }, - { USB_DEVICE(0x0cf3, 0x3121) }, - { USB_DEVICE(0x0cf3, 0xe003) }, - { USB_DEVICE(0x0489, 0xe05f) },/* Atheros AR5BBU12 with sflash firmware */ { USB_DEVICE(0x0489, 0xE02C) },/* Atheros AR5BBU22 with sflash firmware */ - { USB_DEVICE(0x0489, 0xE03C) }, { USB_DEVICE(0x0489, 0xE036) }, + { USB_DEVICE(0x0489, 0xE03C) }, { } /* Terminating entry */ };
@@ -121,39 +121,39 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);static const struct usb_device_id ath3k_blist_tbl[] = {/* Atheros AR3012 with sflash firmware*/ + {USB_DEVICE (0x0489 ,0xe04e ), .driver_info =BTUSB_ATH3012 }, + {USB_DEVICE (0x0489 ,0xe04d ), .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 ,0x3007 ), .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 ,0x3007 ), .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 ,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 (0x0cf3 ,0xe003 ), .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 AR5BBU22 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 }, { }/* Terminating entry */ };
drivers/bluetooth/btusb.c +27 -27
101 lines not on this page · raw message
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/bluetooth-append-new-supported-device-to-the-list.patch queue-3.14/bluetooth-sort-the-list-of-ids-in-the-source-code.patch