2011-12-21 02:19:00

by Bing Zhao

Subject: [PATCH] Bluetooth: btusb: fix bInterval for high/super speed isochronous endpoints

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 <[email protected]>
Signed-off-by: Bing Zhao <[email protected]>
---
drivers/bluetooth/btusb.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ea5ad1c..a67c6db 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -508,15 +508,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)

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));
--
1.7.4.1

2011-12-21 04:18:35

by Gustavo Padovan

Subject: Re: [PATCH] Bluetooth: btusb: fix bInterval for high/super speed isochronous endpoints

Hi Bing,

* Bing Zhao <[email protected]> [2011-12-20 18:19:00 -0800]:

> 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 <[email protected]>
> Signed-off-by: Bing Zhao <[email protected]>
> ---
> drivers/bluetooth/btusb.c | 9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)

Applied, thanks.

Gustavo

2011-12-21 02:28:36

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: btusb: fix bInterval for high/super speed isochronous endpoints

Hi Bing,

> 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 <[email protected]>
> Signed-off-by: Bing Zhao <[email protected]>
> ---
> drivers/bluetooth/btusb.c | 9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index ea5ad1c..a67c6db 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -508,15 +508,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)
>
> 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;

this looks better. And don't ask me why I did not do that from the
beginning ;)

Acked-by: Marcel Holtmann <[email protected]>

Regards

Marcel