diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 16:26:01 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 16:26:01 -0300 |
| commit | 220b881a77eca96afdd6037dbca3441e8938228f (patch) | |
| tree | 51d1a273521238b5127409c9ea2c0b2df02ec6e9 /drivers | |
| parent | 80a1e1dbf62a08984d4c1bfb5a4bca38c3e1664f (diff) | |
| parent | 6f5ef998b7b0b1bf1471654bf6176a5419197128 (diff) | |
| download | kernel_samsung_espresso10-220b881a77eca96afdd6037dbca3441e8938228f.zip kernel_samsung_espresso10-220b881a77eca96afdd6037dbca3441e8938228f.tar.gz kernel_samsung_espresso10-220b881a77eca96afdd6037dbca3441e8938228f.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 8668114..762a510 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -71,6 +71,9 @@ static struct usb_device_id btusb_table[] = { /* Apple MacBookAir3,1, MacBookAir3,2 */ { USB_DEVICE(0x05ac, 0x821b) }, + /* Apple MacBookPro8,2 */ + { USB_DEVICE(0x05ac, 0x821a) }, + /* AVM BlueFRITZ! USB v2.0 */ { USB_DEVICE(0x057c, 0x3800) }, @@ -690,7 +693,8 @@ 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) + if (!data->bulk_tx_ep || (hdev->conn_hash.acl_num < 1 && + hdev->conn_hash.le_num < 1)) return -ENODEV; urb = usb_alloc_urb(0, GFP_ATOMIC); |