rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

already applied

This commit is contained in:
Dave Jones 2013-02-28 12:47:07 -05:00
parent 1d266453e3
commit d08ec557c7
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch
View File

@ -1,56 +0,0 @@
From a5b6b6d3574e57559ec44865f48022cd116dd669 Mon Sep 17 00:00:00 2001
From: AceLan Kao <acelan.kao@canonical.com>
Date: Thu, 3 Jan 2013 12:25:00 +0800
Subject: [PATCH] Bluetooth: Add support for Foxconn / Hon Hai [0489:e056]
Add support for the AR9462 chip
T: Bus=01 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#= 4 Spd=12 MxCh= 0
D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1
P: Vendor=0489 ProdID=e056 Rev=00.01
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: AceLan Kao <acelan.kao@canonical.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@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 b00000e..b86ea45 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -81,6 +81,7 @@ static struct usb_device_id ath3k_table[] = {
{ USB_DEVICE(0x0CF3, 0xE004) },
{ USB_DEVICE(0x0930, 0x0219) },
{ USB_DEVICE(0x0489, 0xe057) },
+ { USB_DEVICE(0x0489, 0xe056) },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xE02C) },
@@ -108,6 +109,7 @@ static struct usb_device_id ath3k_blist_tbl[] = {
{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
/* Atheros AR5BBU22 with sflash firmware */
{ USB_DEVICE(0x0489, 0xE03C), .driver_info = BTUSB_ATH3012 },
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index a1d4ede..c76030e 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -139,6 +139,7 @@ static struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 },
{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
--
1.8.1.2

8
kernel.spec
View File

@ -773,9 +773,6 @@ Patch22257: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
#rhbz 906055
Patch22258: perf-hists-Fix-period-symbol_conf.field_sep-display.patch
#rhbz 879408
Patch22259: Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch
#CVE-2013-1763 rhbz 915052,915057
Patch22260: sock_diag-Fix-out-of-bounds-access-to-sock_diag_handlers.patch
@ -1510,9 +1507,6 @@ ApplyPatch alps.patch
#rhbz 892060
ApplyPatch ipv6-dst-from-ptr-race.patch
#rhbz 879408
#ApplyPatch Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch
#CVE-2013-1763 rhbz 915052,915057
ApplyPatch sock_diag-Fix-out-of-bounds-access-to-sock_diag_handlers.patch
@ -2415,11 +2409,11 @@ fi
- brcmsmac-updates-rhbz892428.patch
- silence-brcmsmac-warning.patch
- net-fix-infinite-loop-in-__skb_recv_datagram.patch
- Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch
Needs checking:
- arm-tegra-nvec-kconfig.patch
- arm-tegra-sdhci-module-fix.patch
Needs reworking:
- Bluetooth-Add-support-for-Foxconn-Hon-Hai-0489-e056.patch
- 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
* Tue Feb 26 2013 Justin M. Forbes <jforbes@redhat.com>