Patchwork UBUNTU: SAUCE: Revert "Bluetooth: Add new PID for Atheros 3011"

login
register
mail settings
Submitter Herton Ronaldo Krzesinski
Date April 8, 2011, 7:22 p.m.
Message ID <1302290529-3964-1-git-send-email-herton.krzesinski@canonical.com>
Download mbox | patch
Permalink /patch/90409/
State New
Headers show

Comments

Herton Ronaldo Krzesinski - April 8, 2011, 7:22 p.m.
From: Gustavo F. Padovan <padovan@profusion.mobi>

This reverts commit be93112accb42c5586a459683d71975cc70673ca.

Bug https://bugzilla.kernel.org/show_bug.cgi?id=27402 reported that some
devices are not working after this commit, so as I don't have the hardware
I'll revert it until a solution comes.

Conflicts:

	drivers/bluetooth/ath3k.c
	drivers/bluetooth/btusb.c

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
BugLink: http://bugs.launchpad.net/bugs/720949
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
---
 drivers/bluetooth/ath3k.c |    3 ---
 drivers/bluetooth/btusb.c |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)
Herton Ronaldo Krzesinski - April 8, 2011, 7:28 p.m.
On Fri, Apr 08, 2011 at 04:22:09PM -0300, Herton Ronaldo Krzesinski wrote:
> From: Gustavo F. Padovan <padovan@profusion.mobi>
> 
> This reverts commit be93112accb42c5586a459683d71975cc70673ca.
> 
> Bug https://bugzilla.kernel.org/show_bug.cgi?id=27402 reported that some
> devices are not working after this commit, so as I don't have the hardware
> I'll revert it until a solution comes.
> 
> Conflicts:
> 
> 	drivers/bluetooth/ath3k.c
> 	drivers/bluetooth/btusb.c

Ops, forgot to add on header, this is for natty.

And it's still only on Gustavo bluetooth tree for now
(git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git),
so submitted as SAUCE, not sure it's ok.
Tim Gardner - April 8, 2011, 8:16 p.m.
applied

Patch

diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
index 6dcd55a..8a86e3a 100644
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
@@ -36,9 +36,6 @@  static struct usb_device_id ath3k_table[] = {
 	/* Atheros AR3011 */
 	{ USB_DEVICE(0x0CF3, 0x3000) },
 
-	/* Atheros AR3011 with sflash firmware*/
-	{ USB_DEVICE(0x0CF3, 0x3002) },
-
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03F0, 0x311D) },
 
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 700a384..3c701c7 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -99,9 +99,6 @@  static struct usb_device_id blacklist_table[] = {
 	/* Broadcom BCM2033 without firmware */
 	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE },
 
-	/* Atheros 3011 with sflash firmware */
-	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
-
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },