diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-10-04 14:06:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-10-04 14:06:47 -0400 |
| commit | d6222fb0d669307a49e2a96aad86c156a9bb9551 (patch) | |
| tree | 99c821e5823999b99e7fd49fb840d18cbb89b238 /drivers | |
| parent | 76ed94be65c8bd80b565865c186dd9f24bb2f23b (diff) | |
| parent | c510eae377c773241ff0b6369a8f3581da941a51 (diff) | |
Merge branch 'master' of git://github.com/padovan/bluetooth-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 9cbac6b445e..675246a6f7e 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -60,6 +60,9 @@ static struct usb_device_id btusb_table[] = { /* Generic Bluetooth USB device */ { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, + /* Broadcom SoftSailing reporting vendor specific */ + { USB_DEVICE(0x05ac, 0x21e1) }, + /* Apple MacBookPro 7,1 */ { USB_DEVICE(0x05ac, 0x8213) }, @@ -708,8 +711,7 @@ static int btusb_send_frame(struct sk_buff *skb) break; case HCI_ACLDATA_PKT: - if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 && - hdev->conn_hash.le_num < 1)) + if (!data->bulk_tx_ep) return -ENODEV; urb = usb_alloc_urb(0, GFP_ATOMIC); |