diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-20 20:47:17 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-20 20:47:17 +0100 |
| commit | 9d4990a260ce395493848640bed94fb55f440f10 (patch) | |
| tree | ab6505e7c7420234575df3f4451f4da0ac38e6dd /drivers/bluetooth/btusb.c | |
| parent | b44: remove __exit from b44_pci_exit() (diff) | |
| parent | ath9k: stop on rates with idx -1 in ath9k rate control's .tx_status (diff) | |
| download | linux-9d4990a260ce395493848640bed94fb55f440f10.tar.xz linux-9d4990a260ce395493848640bed94fb55f440f10.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index f00f596c1029..789c9b579aea 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[] = { /* Broadcom BCM20702A0 */ { USB_DEVICE(0x0a5c, 0x21e3) }, + { USB_DEVICE(0x0a5c, 0x21f3) }, { USB_DEVICE(0x413c, 0x8197) }, { } /* Terminating entry */ @@ -726,9 +727,6 @@ static int btusb_send_frame(struct sk_buff *skb) usb_fill_bulk_urb(urb, data->udev, pipe, skb->data, skb->len, btusb_tx_complete, skb); - if (skb->priority >= HCI_PRIO_MAX - 1) - urb->transfer_flags = URB_ISO_ASAP; - hdev->stat.acl_tx++; break; |