[patch 07/11] bluetooth: add quirks for a few hci_usb devices

[patch 07/11] bluetooth: add quirks for a few hci_usb devices

[akpm]

From: Ben Collins <ben.collins@canonical.com>

Preface: The "Broadcom" device is on unreleased hardware, so I can't
disclose the actual model.

When the Dell 370 and 410 BT adapters are put into BT radio mode, they
need to be prepared like many other Broadcom adapters.

Also, add quirk Broadcom 2046 devices with HCI_RESET.  Reference for this
bug: https://launchpad.net/bugs/249448

Signed-off-by: Michael Frey <michael.frey@canonical.com>
Signed-off-by: Mario Limonciello <Mario_Limonciello@Dell.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Ben Collins <ben.collins@canonical.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/bluetooth/hci_usb.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff -puN drivers/bluetooth/hci_usb.c~bluetooth-add-quirks-for-a-few-hci_usb-devices drivers/bluetooth/hci_usb.c
--- a/drivers/bluetooth/hci_usb.c~bluetooth-add-quirks-for-a-few-hci_usb-devices
+++ a/drivers/bluetooth/hci_usb.c
@@ -134,6 +134,13 @@ static struct usb_device_id blacklist_id
 
 	/* Dell laptop with Broadcom chip */
 	{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+	/* Dell Wireless 370 */
+	{ USB_DEVICE(0x413c, 0x8156), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+	/* Dell Wireless 410 */
+	{ USB_DEVICE(0x413c, 0x8152), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+
+	/* Broadcom 2046 */
+	{ USB_DEVICE(0x0a5c, 0x2151), .driver_info = HCI_RESET },
 
 	/* Microsoft Wireless Transceiver for Bluetooth 2.0 */
 	{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },
_

Re: [patch 07/11] bluetooth: add quirks for a few hci_usb devices

[David Miller]

From: akpm@linux-foundation.org
Date: Wed, 30 Jul 2008 12:37:39 -0700

> From: Ben Collins <ben.collins@canonical.com>
> 
> Preface: The "Broadcom" device is on unreleased hardware, so I can't
> disclose the actual model.
> 
> When the Dell 370 and 410 BT adapters are put into BT radio mode, they
> need to be prepared like many other Broadcom adapters.
> 
> Also, add quirk Broadcom 2046 devices with HCI_RESET.  Reference for this
> bug: https://launchpad.net/bugs/249448
> 
> Signed-off-by: Michael Frey <michael.frey@canonical.com>
> Signed-off-by: Mario Limonciello <Mario_Limonciello@Dell.com>
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> Signed-off-by: Ben Collins <ben.collins@canonical.com>
> Acked-by: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

My understanding is that Michael Frey wrote this patch, and Ben
was just submitting it to us from the pile of Ubuntu kernel bits
he has.

So I've applied this, marking Michael as the patch author.

Let me know if I got that wrong and I'll fix it up before
pushing the change out to the net-2.6 tree.

Thanks!

Re: [patch 07/11] bluetooth: add quirks for a few hci_usb devices

[Ben Collins]

On Wed, 2008-07-30 at 17:00 -0700, David Miller wrote:
> From: akpm@linux-foundation.org
> Date: Wed, 30 Jul 2008 12:37:39 -0700
> 
> > From: Ben Collins <ben.collins@canonical.com>
> > 
> > Preface: The "Broadcom" device is on unreleased hardware, so I can't
> > disclose the actual model.
> > 
> > When the Dell 370 and 410 BT adapters are put into BT radio mode, they
> > need to be prepared like many other Broadcom adapters.
> > 
> > Also, add quirk Broadcom 2046 devices with HCI_RESET.  Reference for this
> > bug: https://launchpad.net/bugs/249448
> > 
> > Signed-off-by: Michael Frey <michael.frey@canonical.com>
> > Signed-off-by: Mario Limonciello <Mario_Limonciello@Dell.com>
> > Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> > Signed-off-by: Ben Collins <ben.collins@canonical.com>
> > Acked-by: Marcel Holtmann <marcel@holtmann.org>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> My understanding is that Michael Frey wrote this patch, and Ben
> was just submitting it to us from the pile of Ubuntu kernel bits
> he has.
> 
> So I've applied this, marking Michael as the patch author.
> 
> Let me know if I got that wrong and I'll fix it up before
> pushing the change out to the net-2.6 tree.

The patch actually has three authors (one for each device), so I just
collapsed it into one patch. I'm not concerned about my authorship being
shown properly, so leaving it as Michael is fine by me :)

Re: [patch 07/11] bluetooth: add quirks for a few hci_usb devices

[Mario Limonciello]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

Fine by me too.

Ben Collins wrote:
> On Wed, 2008-07-30 at 17:00 -0700, David Miller wrote:
>   
>
> The patch actually has three authors (one for each device), so I just
> collapsed it into one patch. I'm not concerned about my authorship being
> shown properly, so leaving it as Michael is fine by me :)
>
>   

-- 
Mario Limonciello
*Dell | Linux Engineering*
mario_limonciello@dell.com


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]

Re: [patch 07/11] bluetooth: add quirks for a few hci_usb devices

[David Miller]

From: Ben Collins <ben.collins@canonical.com>
Date: Thu, 31 Jul 2008 11:13:41 -0400

> The patch actually has three authors (one for each device), so I just
> collapsed it into one patch. I'm not concerned about my authorship being
> shown properly, so leaving it as Michael is fine by me :)

Great, then that's what I'll do :)