aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-01-02 16:43:54 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-02 16:43:54 -0500
commitdc0d633e35643662f27a0b1c531da3cd6b204b9c (patch)
treecae724ecca3fb997bf3ad6b70bff4e3c739cd648 /drivers
parentaef6c928a92481f75fbd548eb8c1e840912444b8 (diff)
parent4ae1652ef1bf38e07caa5d1d86ffd3b31103b55a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bluetooth/btusb.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ea5ad1cbbd3d..fbfba802a3d7 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -101,6 +101,7 @@ static struct usb_device_id btusb_table[] = {
101 { USB_DEVICE(0x0c10, 0x0000) }, 101 { USB_DEVICE(0x0c10, 0x0000) },
102 102
103 /* Broadcom BCM20702A0 */ 103 /* Broadcom BCM20702A0 */
104 { USB_DEVICE(0x0a5c, 0x21e3) },
104 { USB_DEVICE(0x413c, 0x8197) }, 105 { USB_DEVICE(0x413c, 0x8197) },
105 106
106 { } /* Terminating entry */ 107 { } /* Terminating entry */
@@ -508,15 +509,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
508 509
509 pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress); 510 pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress);
510 511
511 urb->dev = data->udev; 512 usb_fill_int_urb(urb, data->udev, pipe, buf, size, btusb_isoc_complete,
512 urb->pipe = pipe; 513 hdev, data->isoc_rx_ep->bInterval);
513 urb->context = hdev;
514 urb->complete = btusb_isoc_complete;
515 urb->interval = data->isoc_rx_ep->bInterval;
516 514
517 urb->transfer_flags = URB_FREE_BUFFER | URB_ISO_ASAP; 515 urb->transfer_flags = URB_FREE_BUFFER | URB_ISO_ASAP;
518 urb->transfer_buffer = buf;
519 urb->transfer_buffer_length = size;
520 516
521 __fill_isoc_descriptor(urb, size, 517 __fill_isoc_descriptor(urb, size,
522 le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize)); 518 le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize));