aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-08-06 14:36:49 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-08-21 13:46:44 -0400
commit92c385f46b30f4954e9dd2d2005c12d233b479ea (patch)
treebd04c209f3f977a51a17b006ecf305932b31ced4
parentbc21fde2d549d1cb1ebef04016eb7affa43bb5c1 (diff)
Bluetooth: Use USB_VENDOR_AND_INTERFACE() for Broadcom devices
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>
-rw-r--r--drivers/bluetooth/btusb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 2fe7776dc49c..e791b20beaf5 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -94,16 +94,14 @@ static struct usb_device_id btusb_table[] = {
94 94
95 /* Broadcom BCM20702A0 */ 95 /* Broadcom BCM20702A0 */
96 { USB_DEVICE(0x0489, 0xe042) }, 96 { USB_DEVICE(0x0489, 0xe042) },
97 { USB_DEVICE(0x0a5c, 0x21e3) },
98 { USB_DEVICE(0x0a5c, 0x21e6) },
99 { USB_DEVICE(0x0a5c, 0x21e8) },
100 { USB_DEVICE(0x0a5c, 0x21f3) },
101 { USB_DEVICE(0x0a5c, 0x21f4) },
102 { USB_DEVICE(0x413c, 0x8197) }, 97 { USB_DEVICE(0x413c, 0x8197) },
103 98
104 /* Foxconn - Hon Hai */ 99 /* Foxconn - Hon Hai */
105 { USB_DEVICE(0x0489, 0xe033) }, 100 { USB_DEVICE(0x0489, 0xe033) },
106 101
102 /*Broadcom devices with vendor specific id */
103 { USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },
104
107 { } /* Terminating entry */ 105 { } /* Terminating entry */
108}; 106};
109 107