| From fa0fb93f2ac308a76fa64eb57c18511dadf97089 Mon Sep 17 00:00:00 2001 |
| From: Bing Zhao <bzhao@marvell.com> |
| Date: Tue, 20 Dec 2011 18:19:00 -0800 |
| Subject: Bluetooth: btusb: fix bInterval for high/super speed isochronous endpoints |
| |
| From: Bing Zhao <bzhao@marvell.com> |
| |
| commit fa0fb93f2ac308a76fa64eb57c18511dadf97089 upstream. |
| |
| For high-speed/super-speed isochronous endpoints, the bInterval |
| value is used as exponent, 2^(bInterval-1). Luckily we have |
| usb_fill_int_urb() function that handles it correctly. So we just |
| call this function to fill in the RX URB. |
| |
| Cc: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Bing Zhao <bzhao@marvell.com> |
| Acked-by: Marcel Holtmann <marcel@holtmann.org> |
| Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/bluetooth/btusb.c | 9 ++------- |
| 1 file changed, 2 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/bluetooth/btusb.c |
| +++ b/drivers/bluetooth/btusb.c |
| @@ -507,15 +507,10 @@ static int btusb_submit_isoc_urb(struct |
| |
| pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress); |
| |
| - urb->dev = data->udev; |
| - urb->pipe = pipe; |
| - urb->context = hdev; |
| - urb->complete = btusb_isoc_complete; |
| - urb->interval = data->isoc_rx_ep->bInterval; |
| + usb_fill_int_urb(urb, data->udev, pipe, buf, size, btusb_isoc_complete, |
| + hdev, data->isoc_rx_ep->bInterval); |
| |
| urb->transfer_flags = URB_FREE_BUFFER | URB_ISO_ASAP; |
| - urb->transfer_buffer = buf; |
| - urb->transfer_buffer_length = size; |
| |
| __fill_isoc_descriptor(urb, size, |
| le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize)); |