From d2757e6635f7294565981164acf447a42d15224b Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Fri, 8 Apr 2011 19:22:09 -0300 Subject: [PATCH] UBUNTU: SAUCE: Revert "Bluetooth: Add new PID for Atheros 3011" 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 BugLink: http://bugs.launchpad.net/bugs/720949 cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Tim Gardner --- drivers/bluetooth/ath3k.c | 3 --- drivers/bluetooth/btusb.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 6dcd55a74c0a..8a86e3a6736c 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 700a3840fddc..3c701c7544fe 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 }, -- 2.11.0