>From c21eede5fafd811fdf6c100693a07a64f621ddea Mon Sep 17 00:00:00 2001
From: Costa Yao <[email protected]>
Date: Fri, 18 Nov 2011 14:08:56 +0800
Subject: [PATCH] Bluetooth: btusb: Add AR3006 in blacklist_table.
Add AR3006 entry in blacklist_table in btusb.c for bcdDevice check.
Then ath3k.c has the chance to download firmware and reset hardware.
Signed-off-by: Costa Yao <[email protected]>
---
drivers/bluetooth/btusb.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 39dd65c..4ba4fdf 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -54,7 +54,7 @@ static struct usb_driver btusb_driver;
#define BTUSB_BCM92035 0x10
#define BTUSB_BROKEN_ISOC 0x20
#define BTUSB_WRONG_SCO_MTU 0x40
-#define BTUSB_ATH3012 0x80
+#define BTUSB_ATH3K 0x80
static struct usb_device_id btusb_table[] = {
/* Bluetooth USB interface */
@@ -124,7 +124,8 @@ static struct usb_device_id blacklist_table[] = {
{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
/* Atheros 3012 with sflash firmware */
- { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
+ { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3K },
+ { USB_DEVICE(0x0cf3, 0x3006), .driver_info = BTUSB_ATH3K },
/* Atheros AR5BBU12 with sflash firmware */
{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
@@ -937,7 +938,7 @@ static int btusb_probe(struct usb_interface *intf,
if (ignore_sniffer && id->driver_info & BTUSB_SNIFFER)
return -ENODEV;
- if (id->driver_info & BTUSB_ATH3012) {
+ if (id->driver_info & BTUSB_ATH3K) {
struct usb_device *udev = interface_to_usbdev(intf);
/* Old firmware would otherwise let ath3k driver load
--
1.7.4.1
SGkgTWFyY2VsLA0KDQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IE1hcmNl
bCBIb2x0bWFubiBbbWFpbHRvOm1hcmNlbEBob2x0bWFubi5vcmddDQo+IFNlbnQ6IDIwMTHlubQx
MeaciDIy5pelIDE1OjQxDQo+IFRvOiBZYW8sIENvc3RhDQo+IENjOiBwYWRvdmFuQHByb2Z1c2lv
bi5tb2JpOyBsaW51eC1ibHVldG9vdGhAdmdlci5rZXJuZWwub3JnDQo+IFN1YmplY3Q6IFJlOiBb
UEFUQ0hdIEJsdWV0b290aDogYnR1c2I6IEFkZCBBUjMwMDYgaW4gYmxhY2tsaXN0X3RhYmxlDQo+
IA0KPiBIaSBDb3N0YSwNCj4gDQo+ID4gRnJvbSBjMjFlZWRlNWZhZmQ4MTFmZGY2YzEwMDY5M2Ew
N2E2NGY2MjFkZGVhIE1vbiBTZXAgMTcgMDA6MDA6MDANCj4gMjAwMQ0KPiA+IEZyb206IENvc3Rh
IFlhbyA8Y3F5YW9AcWNhLnF1YWxjb21tLmNvbT4NCj4gPiBEYXRlOiBGcmksIDE4IE5vdiAyMDEx
IDE0OjA4OjU2ICswODAwDQo+ID4gU3ViamVjdDogW1BBVENIXSBCbHVldG9vdGg6IGJ0dXNiOiBB
ZGQgQVIzMDA2IGluIGJsYWNrbGlzdF90YWJsZS4NCj4gDQo+IHdoeSBkbyB3ZSBoYXZlIHRoaXMg
dHdpY2UgaGVyZS4gUGxlYXNlIGZpeCB5b3VyIG1haWwgc3lzdGVtLiBJdCBpcyBub3QgR3VzdGF2
bydzDQo+IGpvYiB0byBmaXggdXAgeW91ciBlbWFpbHMuDQo+IA0KPiA+IEFkZCBBUjMwMDYgZW50
cnkgaW4gYmxhY2tsaXN0X3RhYmxlIGluIGJ0dXNiLmMgZm9yIGJjZERldmljZSBjaGVjay4NCj4g
PiBUaGVuIGF0aDNrLmMgaGFzIHRoZSBjaGFuY2UgdG8gZG93bmxvYWQgZmlybXdhcmUgYW5kIHJl
c2V0IGhhcmR3YXJlLg0KPiA+DQo+ID4gU2lnbmVkLW9mZi1ieTogQ29zdGEgWWFvIDxjcXlhb0Bx
Y2EucXVhbGNvbW0uY29tPg0KPiANCj4gQW5kIGFzIEkgc2FpZCBvbmNlIEkgYWNrZWQgaXQgeW91
IGNhbiBjYXJyeSB0aGF0IGFjayBhcm91bmQuIFlvdSBhcmUgbWFraW5nIHRoZQ0KPiBsaWZlIG9m
IHRoZSBtYWludGFpbmVycyBleHRyYSBoYXJkIGhlcmUuDQo+IA0KU29ycnkuDQpQYWRvdmFuIGhh
cyBzZW50IGEgZS1tYWlsIHRvIG1lLCBzYWlkIHRoYXQgdGhlIHBhdGNoIGJlZm9yZSB3YXMgbm90
IGZvcm1hdHRlZCBwcm9wZXJseS4NClNvIEkgcmVjcmVhdGVkIHRoaXMgcGF0Y2guDQogDQo+IEFj
a2VkLWJ5OiBNYXJjZWwgSG9sdG1hbm4gPG1hcmNlbEBob2x0bWFubi5vcmc+DQo+IA0KPiBSZWdh
cmRzDQo+IA0KPiBNYXJjZWwNCj4gDQpCZXN0IHdpc2hlcywNCkNvc3RhIFlhbw0K
Hi Costa,
> From c21eede5fafd811fdf6c100693a07a64f621ddea Mon Sep 17 00:00:00 2001
> From: Costa Yao <[email protected]>
> Date: Fri, 18 Nov 2011 14:08:56 +0800
> Subject: [PATCH] Bluetooth: btusb: Add AR3006 in blacklist_table.
why do we have this twice here. Please fix your mail system. It is not
Gustavo's job to fix up your emails.
> Add AR3006 entry in blacklist_table in btusb.c for bcdDevice check.
> Then ath3k.c has the chance to download firmware and reset hardware.
>
> Signed-off-by: Costa Yao <[email protected]>
And as I said once I acked it you can carry that ack around. You are
making the life of the maintainers extra hard here.
Acked-by: Marcel Holtmann <[email protected]>
Regards
Marcel
Hi Costa,
* Yao, Costa <[email protected]> [2011-11-22 02:49:50 +0000]:
> From c21eede5fafd811fdf6c100693a07a64f621ddea Mon Sep 17 00:00:00 2001
> From: Costa Yao <[email protected]>
> Date: Fri, 18 Nov 2011 14:08:56 +0800
> Subject: [PATCH] Bluetooth: btusb: Add AR3006 in blacklist_table.
>
> Add AR3006 entry in blacklist_table in btusb.c for bcdDevice check.
> Then ath3k.c has the chance to download firmware and reset hardware.
>
> Signed-off-by: Costa Yao <[email protected]>
> ---
> drivers/bluetooth/btusb.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
There is still something wrong with your patch.
Applying: Bluetooth: btusb: Add AR3006 in blacklist_table
error: patch failed: drivers/bluetooth/btusb.c:54
error: drivers/bluetooth/btusb.c: patch does not apply
Patch failed at 0001 Bluetooth: btusb: Add AR3006 in blacklist_table
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Please fix your patch and resend.
Gustavo