Return-Path: From: "Yao, Costa" To: "marcel@holtmann.org" , "padovan@profusion.mobi" , "linux-bluetooth@vger.kernel.org" Subject: [PATCH] Bluetooth: btusb: Use USB_INTERFACE_INFO to do device matching Date: Tue, 15 Nov 2011 04:53:17 +0000 Message-ID: <07BBB2AAB1A10A488A2AD166C7CB8B0DEF2759@nasanexd02b.na.qualcomm.com> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: 1 Use USB_INTERFACE_INFO to do device matching, other than USB_DEVICE_INFO. 2 Delete desc.bInterfaceNumber != 0 check. Signed-off-by: Costa Yao --- drivers/bluetooth/btusb.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2bd87d4..fbac911 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -57,8 +57,8 @@ static struct usb_driver btusb_driver; #define BTUSB_ATH3012 0x80 static struct usb_device_id btusb_table[] = { - /* Generic Bluetooth USB device */ - { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, + /* Bluetooth USB interface */ + { USB_INTERFACE_INFO(0xe0, 0x01, 0x01) }, /* Broadcom SoftSailing reporting vendor specific */ { USB_DEVICE(0x05ac, 0x21e1) }, @@ -918,10 +918,6 @@ static int btusb_probe(struct usb_interface *intf, BT_DBG("intf %p id %p", intf, id); - /* interface numbers are hardcoded in the spec */ - if (intf->cur_altsetting->desc.bInterfaceNumber != 0) - return -ENODEV; - if (!id->driver_info) { const struct usb_device_id *match; match = usb_match_id(intf, blacklist_table); @@ -1017,8 +1013,12 @@ static int btusb_probe(struct usb_interface *intf, hdev->owner = THIS_MODULE; - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); + /* According to HCI-USB specification, the interface for + * SCO data endpoint follows the interface for commands, + * events and ACL data + */ + data->isoc = usb_ifnum_to_if(data->udev, + intf->cur_altsetting->desc.bInterfaceNumber + 1); if (!reset) set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); -- 1.7.4.1