diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-08 14:17:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-08 14:17:39 -0700 |
| commit | b78370c021c9d52721c7f96fbb3e10f5b2f428d3 (patch) | |
| tree | 496f301588a92b4573967cf62dd01dd56aec1b7f /drivers/bluetooth/ath3k.c | |
| parent | 8063968af9e3b96da3b19992a7d580d8ce921562 (diff) | |
| parent | c6ac68a612783aab0aad62b8edd36791b251aadb (diff) | |
| download | kernel_replicant_linux-b78370c021c9d52721c7f96fbb3e10f5b2f428d3.tar.gz kernel_replicant_linux-b78370c021c9d52721c7f96fbb3e10f5b2f428d3.tar.bz2 kernel_replicant_linux-b78370c021c9d52721c7f96fbb3e10f5b2f428d3.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
pull request: wireless-next 2014-06-06
Please accept this batch of fixes intended for the 3.16 stream.
For the bluetooth bits, Gustavo says:
"Here some more patches for 3.16. We know that Linus already opened the merge
window, but this is fix only pull request, and most of the patches here are
also tagged for stable."
Along with that, Andrea Merello provides a fix for the broken scanning
in the venerable at76c50x driver...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/ath3k.c')
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index a83b57e57b63..f98380648cb3 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -193,9 +193,10 @@ static int ath3k_load_firmware(struct usb_device *udev, sent += 20; count -= 20; + pipe = usb_sndbulkpipe(udev, 0x02); + while (count) { size = min_t(uint, count, BULK_SIZE); - pipe = usb_sndbulkpipe(udev, 0x02); memcpy(send_buf, firmware->data + sent, size); err = usb_bulk_msg(udev, pipe, send_buf, size, |