Patchwork [Precise,1/2] Bluetooth: Use USB_VENDOR_AND_INTERFACE() for Broadcom devices

login
register
mail settings
Submitter Jesse Sung
Date Oct. 8, 2012, 9:22 a.m.
Message ID <1349688161-11309-1-git-send-email-jesse.sung@canonical.com>
Download mbox | patch
Permalink /patch/189954/
State New
Headers show

Comments

Jesse Sung - Oct. 8, 2012, 9:22 a.m.
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Many Broadcom devices has a vendor specific devices class, with this rule
we match all existent and future controllers with this behavior.

We also remove old rules to that matches product id for Broadcom devices.

Tested-by: John Hommel <john.hommel@hp.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
(backported from commit 92c385f46b30f4954e9dd2d2005c12d233b479ea upstream)
Signed-off-by: Wen-chien Jesse Sung <jesse.sung@canonical.com>
---
 drivers/bluetooth/btusb.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
Tim Gardner - Oct. 8, 2012, 12:45 p.m.

Stefan Bader - Oct. 8, 2012, 1:15 p.m.
Should be ok (assuming the older hw also has the vendor specific class).
Tim Gardner - Oct. 8, 2012, 3:28 p.m.

Patch

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index fc40dbd..801b196 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -102,17 +102,14 @@  static struct usb_device_id btusb_table[] = {
 
 	/* Broadcom BCM20702A0 */
 	{ USB_DEVICE(0x0489, 0xe042) },
-	{ USB_DEVICE(0x0a5c, 0x21e1) },
-	{ USB_DEVICE(0x0a5c, 0x21e3) },
-	{ USB_DEVICE(0x0a5c, 0x21e6) },
-	{ USB_DEVICE(0x0a5c, 0x21e8) },
-	{ USB_DEVICE(0x0a5c, 0x21f3) },
-	{ USB_DEVICE(0x0a5c, 0x21f4) },
 	{ USB_DEVICE(0x413c, 0x8197) },
 
 	/* Foxconn - Hon Hai */
 	{ USB_DEVICE(0x0489, 0xe033) },
 
+	/*Broadcom devices with vendor specific id */
+	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
+
 	{ }	/* Terminating entry */
 };