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

[Josh Boyer]

commit 9a2eae92674ef19bf62bde56aae08bd2172658ae
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Apr 2 14:23:58 2013 -0400

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

 ...dd-support-for-atheros-04ca-3004-device-t.patch |   62 ++++++++++++++++++++
 kernel.spec                                        |    6 ++
 2 files changed, 68 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..8d34a68
--- /dev/null
+++ b/0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
@@ -0,0 +1,62 @@
+From 017de1136ff304ab401dbfee4eca2e796c61797f Mon Sep 17 00:00:00 2001
+From: Josh Boyer <jwboyer at redhat.com>
+Date: Tue, 19 Feb 2013 11:54:16 -0500
+Subject: [PATCH] Bluetooth: Add support for atheros 04ca:3004 device to ath3k
+
+Yet another version of the atheros bluetooth chipset
+
+T:  Bus=01 Lev=02 Prnt=02 Port=03 Cnt=01 Dev#=  3 Spd=12  MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=04ca ProdID=3004 Rev=00.01
+S:  Manufacturer=Atheros Communications
+S:  Product=Bluetooth USB Host Controller
+S:  SerialNumber=Alaska Day 2006
+C:  #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA
+I:  If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+I:  If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
+
+This resolves https://bugzilla.redhat.com/show_bug.cgi?id=844750
+
+Reported-by: niktr at mail.ru
+Signed-off-by: Josh Boyer <jwboyer at redhat.com>
+Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
+---
+ 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 33c9a44..b9908dd 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(0x04CA, 0x3006) },
+ 	{ USB_DEVICE(0x04CA, 0x3008) },
+@@ -108,6 +109,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(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+ 	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 7e351e3..59cde8e 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(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 },
+ 	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 },
+-- 
+1.8.1.4
+
diff --git a/kernel.spec b/kernel.spec
index a27507f..bab8000 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -777,6 +777,9 @@ Patch25006: mac80211-Dont-restart-sta-timer-if-not-running.patch
 #rhbz 927469
 Patch25007: fix-child-thread-introspection.patch
 
+#rhbz 844750
+Patch25008: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1512,6 +1515,8 @@ ApplyPatch HID-usbhid-quirk-for-Realtek-Multi-card-reader.patch
 #rhbz 927469
 ApplyPatch fix-child-thread-introspection.patch
 
+ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2369,6 +2374,7 @@ fi
 #              '-'
 %changelog
 * Tue Apr 02 2013 Josh Boyer <jwboyer at redhat.com>
+- Add support for Atheros 04ca:3004 bluetooth devices (again) (rhbz 844750)
 - Enable CONFIG_SCSI_DMX3191D (rhbz 919874)
 
 * Mon Apr 01 2013 Josh Boyer <jwboyer at redhat.com>