diff mbox

[oneiric] SRU: Bluetooth: Add support for Broadcom BCM20702A0

Message ID 4E8A6996.3010408@canonical.com
State New
Headers show

Commit Message

Wen-chien Jesse Sung Oct. 4, 2011, 2:04 a.m. UTC
Already sent to upstream, and waiting for approval.
http://thread.gmane.org/gmane.linux.bluez.kernel/16570

BugLink: https://bugs.launchpad.net/bugs/854399

SRU Justification:

BCM20702A0 does not declare itself as a bluetooth device. Must add its 
ID to btusb device table to make it work.

 From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
From: Wen-chien Jesse Sung <jesse.sung@canonical.com>
Date: Tue, 4 Oct 2011 09:48:42 +0800
Subject: [PATCH] Add a new entry (413c:8197) to device ID table

Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
---
  drivers/bluetooth/btusb.c |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)

Comments

Tim Gardner Oct. 4, 2011, 3:01 a.m. UTC | #1
On 10/03/2011 08:04 PM, Jesse Sung wrote:
> Already sent to upstream, and waiting for approval.
> http://thread.gmane.org/gmane.linux.bluez.kernel/16570
>
> BugLink: https://bugs.launchpad.net/bugs/854399
>
> SRU Justification:
>
> BCM20702A0 does not declare itself as a bluetooth device. Must add its
> ID to btusb device table to make it work.
>
>  From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
> From: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> Date: Tue, 4 Oct 2011 09:48:42 +0800
> Subject: [PATCH] Add a new entry (413c:8197) to device ID table
>
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
> drivers/bluetooth/btusb.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 513d462..6f6eab8 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -164,6 +164,9 @@ static struct usb_device_id blacklist_table[] = {
> /* Frontline ComProbe Bluetooth Sniffer */
> { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
>
> + /* Broadcom BCM20702A0 */
> + { USB_DEVICE(0x413c, 0x8197) },
> +
> { } /* Terminating entry */
> };
>

We should carry it as an 'UBUNTU: SAUCE:' patch until it collides with 
upstream. Should also apply to P.
Stefan Bader Oct. 4, 2011, 11:17 a.m. UTC | #2
On 04.10.2011 04:04, Jesse Sung wrote:
> Already sent to upstream, and waiting for approval.
> http://thread.gmane.org/gmane.linux.bluez.kernel/16570
> 
> BugLink: https://bugs.launchpad.net/bugs/854399
> 
> SRU Justification:
> 
> BCM20702A0 does not declare itself as a bluetooth device. Must add its ID to
> btusb device table to make it work.
> 
> From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
> From: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> Date: Tue, 4 Oct 2011 09:48:42 +0800
> Subject: [PATCH] Add a new entry (413c:8197) to device ID table
> 
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
>  drivers/bluetooth/btusb.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 513d462..6f6eab8 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -164,6 +164,9 @@ static struct usb_device_id blacklist_table[] = {
>      /* Frontline ComProbe Bluetooth Sniffer */
>      { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
> 
> +    /* Broadcom BCM20702A0 */
> +    { USB_DEVICE(0x413c, 0x8197) },
> +
>      { }    /* Terminating entry */
>  };
> 
Looks limited and little risk

Acked-by: Stefan Bader <smb@canonical.com>
Stefan Bader Oct. 4, 2011, 11:26 a.m. UTC | #3
On 04.10.2011 13:17, Stefan Bader wrote:
> On 04.10.2011 04:04, Jesse Sung wrote:
>> Already sent to upstream, and waiting for approval.
>> http://thread.gmane.org/gmane.linux.bluez.kernel/16570
>>
>> BugLink: https://bugs.launchpad.net/bugs/854399
>>
>> SRU Justification:
>>
>> BCM20702A0 does not declare itself as a bluetooth device. Must add its ID to
>> btusb device table to make it work.
>>
>> From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
>> From: Wen-chien Jesse Sung <jesse.sung@canonical.com>
>> Date: Tue, 4 Oct 2011 09:48:42 +0800
>> Subject: [PATCH] Add a new entry (413c:8197) to device ID table
>>
>> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
>> ---
>>  drivers/bluetooth/btusb.c |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
>> index 513d462..6f6eab8 100644
>> --- a/drivers/bluetooth/btusb.c
>> +++ b/drivers/bluetooth/btusb.c
>> @@ -164,6 +164,9 @@ static struct usb_device_id blacklist_table[] = {
>>      /* Frontline ComProbe Bluetooth Sniffer */
>>      { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
>>
>> +    /* Broadcom BCM20702A0 */
>> +    { USB_DEVICE(0x413c, 0x8197) },
>> +
>>      { }    /* Terminating entry */
>>  };
>>
> Looks limited and little risk
> 
> Acked-by: Stefan Bader <smb@canonical.com>
> 
Agree about the SAUCE. This is a bit border line of trying not to SRU things not
in upstream and simplicity, too.
Tim Gardner Oct. 4, 2011, 12:51 p.m. UTC | #4
On 10/03/2011 08:04 PM, Jesse Sung wrote:
> Already sent to upstream, and waiting for approval.
> http://thread.gmane.org/gmane.linux.bluez.kernel/16570
>
> BugLink: https://bugs.launchpad.net/bugs/854399
>
> SRU Justification:
>
> BCM20702A0 does not declare itself as a bluetooth device. Must add its
> ID to btusb device table to make it work.
>
>  From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
> From: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> Date: Tue, 4 Oct 2011 09:48:42 +0800
> Subject: [PATCH] Add a new entry (413c:8197) to device ID table
>
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
> drivers/bluetooth/btusb.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 513d462..6f6eab8 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -164,6 +164,9 @@ static struct usb_device_id blacklist_table[] = {
> /* Frontline ComProbe Bluetooth Sniffer */
> { USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
>
> + /* Broadcom BCM20702A0 */
> + { USB_DEVICE(0x413c, 0x8197) },
> +
> { } /* Terminating entry */
> };
>

Had to apply by hand, likely because of whitespace damage. The patch was 
also line terminated with ^M
Wen-chien Jesse Sung Oct. 4, 2011, 1:44 p.m. UTC | #5
On 10/04/2011 08:51 PM, Tim Gardner wrote:
> Had to apply by hand, likely because of whitespace damage. The patch was
> also line terminated with ^M

Oops! Mail client problem... Sorry for the that.

Thanks,
Jesse Sung
Herton Ronaldo Krzesinski Oct. 24, 2011, 7:10 p.m. UTC | #6
On Tue, Oct 04, 2011 at 10:04:06AM +0800, Jesse Sung wrote:
> Already sent to upstream, and waiting for approval.
> http://thread.gmane.org/gmane.linux.bluez.kernel/16570
> 
> BugLink: https://bugs.launchpad.net/bugs/854399
> 
> SRU Justification:
> 
> BCM20702A0 does not declare itself as a bluetooth device. Must add
> its ID to btusb device table to make it work.
> 
> From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
> From: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> Date: Tue, 4 Oct 2011 09:48:42 +0800
> Subject: [PATCH] Add a new entry (413c:8197) to device ID table
> 
> Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
> ---
>  drivers/bluetooth/btusb.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 513d462..6f6eab8 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -164,6 +164,9 @@ static struct usb_device_id blacklist_table[] = {
>  	/* Frontline ComProbe Bluetooth Sniffer */
>  	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
> 
> +	/* Broadcom BCM20702A0 */
> +	{ USB_DEVICE(0x413c, 0x8197) },
> +
>  	{ }	/* Terminating entry */
>  };
> 
> -- 
> 1.7.6.3
>

This patch failed verification on bug 854399 (see comment #9). In change
above, you added the id to the blacklist_table, but the original change
was adding it to btusb_table
(https://bugs.launchpad.net/ubuntu/+source/linux/+bug/854399/comments/2)

Can you confirm the first patch is the correct fix, and send a fix
for Oneiric/Precise? (also to upstream, if you sent there the version
with the issue).

> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Tim Gardner Oct. 24, 2011, 11:59 p.m. UTC | #7
On 10/24/2011 01:10 PM, Herton Ronaldo Krzesinski wrote:
> On Tue, Oct 04, 2011 at 10:04:06AM +0800, Jesse Sung wrote:
>> Already sent to upstream, and waiting for approval.
>> http://thread.gmane.org/gmane.linux.bluez.kernel/16570
>>
>> BugLink: https://bugs.launchpad.net/bugs/854399
>>
>> SRU Justification:
>>
>> BCM20702A0 does not declare itself as a bluetooth device. Must add
>> its ID to btusb device table to make it work.
>>
>>  From eed37e8a6c826738fd7d9bfd51dbea6187caca60 Mon Sep 17 00:00:00 2001
>> From: Wen-chien Jesse Sung<jesse.sung@canonical.com>
>> Date: Tue, 4 Oct 2011 09:48:42 +0800
>> Subject: [PATCH] Add a new entry (413c:8197) to device ID table
>>
>> Signed-off-by: Wen-chien Jesse Sung<jesse.sung@canonical.com>
>> ---
>>   drivers/bluetooth/btusb.c |    3 +++
>>   1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
>> index 513d462..6f6eab8 100644
>> --- a/drivers/bluetooth/btusb.c
>> +++ b/drivers/bluetooth/btusb.c
>> @@ -164,6 +164,9 @@ static struct usb_device_id blacklist_table[] = {
>>   	/* Frontline ComProbe Bluetooth Sniffer */
>>   	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },
>>
>> +	/* Broadcom BCM20702A0 */
>> +	{ USB_DEVICE(0x413c, 0x8197) },
>> +
>>   	{ }	/* Terminating entry */
>>   };
>>
>> --
>> 1.7.6.3
>>
>
> This patch failed verification on bug 854399 (see comment #9). In change
> above, you added the id to the blacklist_table, but the original change
> was adding it to btusb_table
> (https://bugs.launchpad.net/ubuntu/+source/linux/+bug/854399/comments/2)
>
> Can you confirm the first patch is the correct fix, and send a fix
> for Oneiric/Precise? (also to upstream, if you sent there the version
> with the issue).
>

Doh! Kinda of missed that one.
diff mbox

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 513d462..6f6eab8 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -164,6 +164,9 @@  static struct usb_device_id blacklist_table[] = {
  	/* Frontline ComProbe Bluetooth Sniffer */
  	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER },

+	/* Broadcom BCM20702A0 */
+	{ USB_DEVICE(0x413c, 0x8197) },
+
  	{ }	/* Terminating entry */
  };