[kernel/f16] Apply upstream patch to add USB device 13d3:3375 (rhbz 811087)

[Josh Boyer]

commit 7dbe0a1257ba85cc5f3763b56a37fa5a76802c48
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Apr 10 15:11:33 2012 -0400

    Apply upstream patch to add USB device 13d3:3375 (rhbz 811087)

 ...dding-USB-device-13d3-3375-as-an-Atheros-.patch |   58 ++++++++++++++++++++
 kernel.spec                                        |    5 ++
 2 files changed, 63 insertions(+), 0 deletions(-)
---
diff --git a/Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch b/Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch
new file mode 100644
index 0000000..f238d50
--- /dev/null
+++ b/Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch
@@ -0,0 +1,58 @@
+From 9498ba7a1d38d42eef4ef6d906ab1743c9f0fd6f Mon Sep 17 00:00:00 2001
+From: Eran <eran at over-here.org>
+Date: Mon, 5 Dec 2011 22:15:29 +0000
+Subject: [PATCH] Bluetooth: Adding USB device 13d3:3375 as an Atheros AR3012.
+
+The bluetooth module in the Asus UX31/UX21 is based on Atheros AR3012
+and requires a firmware to be uploaded before it's usable.
+
+output of usb-devices for this module:
+T:  Bus=01 Lev=02 Prnt=02 Port=07 Cnt=03 Dev#=  6 Spd=12  MxCh= 0
+D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
+P:  Vendor=13d3 ProdID=3375 Rev=00.02
+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
+
+Signed-off-by: Eran <eran at over-here.org>
+Tested-by: Michal Labedzki <michal.labedzki at tieto.com>
+Signed-off-by: Gustavo F. Padovan <padovan at profusion.mobi>
+
+diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
+index 4eca6e5..4844247 100644
+--- a/drivers/bluetooth/ath3k.c
++++ b/drivers/bluetooth/ath3k.c
+@@ -72,6 +72,7 @@ static struct usb_device_id ath3k_table[] = {
+ 
+ 	/* Atheros AR3012 with sflash firmware*/
+ 	{ USB_DEVICE(0x0CF3, 0x3004) },
++	{ USB_DEVICE(0x13d3, 0x3375) },
+ 
+ 	/* Atheros AR5BBU12 with sflash firmware */
+ 	{ USB_DEVICE(0x0489, 0xE02C) },
+@@ -88,6 +89,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
+ 
+ 	/* Atheros AR3012 with sflash firmware*/
+ 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
++	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+ 
+ 	{ }	/* Terminating entry */
+ };
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 22f695e..480cad9 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -129,6 +129,7 @@ static struct usb_device_id blacklist_table[] = {
+ 
+ 	/* Atheros 3012 with sflash firmware */
+ 	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
++	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
+ 
+ 	/* Atheros AR5BBU12 with sflash firmware */
+ 	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
+-- 
+1.7.7.6
+
diff --git a/kernel.spec b/kernel.spec
index 8319ecd..c227df0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -735,6 +735,7 @@ Patch14001: hibernate-watermark.patch
 Patch14010: lis3-improve-handling-of-null-rate.patch
 
 Patch15000: bluetooth-use-after-free.patch
+Patch15001: Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch
 
 Patch19000: ips-noirq.patch
 
@@ -1434,6 +1435,7 @@ ApplyPatch hibernate-watermark.patch
 ApplyPatch lis3-improve-handling-of-null-rate.patch
 
 ApplyPatch bluetooth-use-after-free.patch
+ApplyPatch Bluetooth-Adding-USB-device-13d3-3375-as-an-Atheros-.patch
 
 ApplyPatch ips-noirq.patch
 
@@ -2236,6 +2238,9 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 10 2012 Josh Boyer <jwboyer at redhat.com>
+- Apply upstream patch to add USB device 13d3:3375 (rhbz 811087)
+
 * Tue Apr 10 2012 Mauro Carvalho Chehab <mchehab at redhat.com>
 - Backport dvb-core and a few driver fixes from media tree (rhbz808871)