[kernel/f17] Add support for Atheros 04ca:3004 bluetooth devices (rhbz 844750)

[Josh Boyer]

commit 7a177e376a066e7bce2f96772d91fc2734832a7b
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Feb 19 11:56:05 2013 -0500

    Add support for Atheros 04ca:3004 bluetooth devices (rhbz 844750)

 ...dd-support-for-atheros-04ca-3004-device-t.patch |   47 ++++++++++++++++++++
 kernel.spec                                        |    7 +++
 2 files changed, 54 insertions(+), 0 deletions(-)
---
diff --git a/0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch b/0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
new file mode 100644
index 0000000..cfa1710
--- /dev/null
+++ b/0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
@@ -0,0 +1,47 @@
+From 95e9fe367b98a8f4f3c7538fc40a4f94d7f5e35f Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer at redhat.com>
+Date: Mon, 18 Feb 2013 10:32:13 -0500
+Subject: [PATCH] bluetooth: Add support for atheros 04ca:3004 device to ath3k
+
+Yet another version of the atheros bluetooth chipset
+
+Reported-by: niktr at mail.ru
+Signed-off-by: Josh Boyer <jwboyer at redhat.com>
+---
+ drivers/bluetooth/ath3k.c | 2 ++
+ drivers/bluetooth/btusb.c | 1 +
+ 2 files changed, 3 insertions(+)
+
+
+diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
+index b00000e..284658c 100644
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -76,6 +76,7 @@ static struct usb_device_id ath3k_table[] = {
+ 	{ USB_DEVICE(0x0CF3, 0x3004) },
+ 	{ USB_DEVICE(0x0CF3, 0x311D) },
+ 	{ USB_DEVICE(0x13d3, 0x3375) },
++	{ USB_DEVICE(0x04CA, 0x3004) },
+ 	{ USB_DEVICE(0x04CA, 0x3005) },
+ 	{ USB_DEVICE(0x13d3, 0x3362) },
+ 	{ USB_DEVICE(0x0CF3, 0xE004) },
+@@ -103,6 +104,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
+ 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+ 	{ USB_DEVICE(0x0cf3, 0x311D), .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(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+ 	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index a1d4ede..fa59179 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -134,6 +134,7 @@ static struct usb_device_id blacklist_table[] = {
+ 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+ 	{ USB_DEVICE(0x0cf3, 0x311d), .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(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },
+ 	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
diff --git a/kernel.spec b/kernel.spec
index 298ed72..ab32329 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -767,6 +767,9 @@ Patch22255: usb-cypress-supertop.patch
 #rhbz 911479 911473 CVE-2013-0290
 Patch22256: net-fix-infinite-loop-in-__skb_recv_datagram.patch
 
+#rhbz 844750
+Patch22257: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
+
 Patch23000: silence-brcmsmac-warning.patch
 
 #rhbz 812111
@@ -1486,6 +1489,9 @@ ApplyPatch usb-cypress-supertop.patch
 #rhbz 911479 911473 CVE-2013-0290
 ApplyPatch net-fix-infinite-loop-in-__skb_recv_datagram.patch
 
+#rhbz 844750
+ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
+
 #rhbz 812111
 ApplyPatch alps-v2-3.7.patch
 
@@ -2345,6 +2351,7 @@ fi
 #              '-'
 %changelog
 * Tue Feb 19 2013 Josh Boyer <jwboyer at redhat.com>
+- Add support for Atheros 04ca:3004 bluetooth devices (rhbz 844750)
 - Backport support for newer ALPS touchpads (rhbz 812111)
 
 * Mon Feb 18 2013 Justin M. Forbes <jforbes at redhat.com> - 3.7.9-101