aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/ath3k.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-06-06 11:59:11 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-06-06 11:59:11 -0400
commitc6ac68a612783aab0aad62b8edd36791b251aadb (patch)
tree348e65496111cd7b40365ffd78fcbe7bd2f9a58d /drivers/bluetooth/ath3k.c
parent9e89fd8b7db71038fd9f70f34e210963fa8fc980 (diff)
parentc678de55361aa5b72b1aaa495380a395b8cc1bd2 (diff)
downloadkernel_replicant_linux-c6ac68a612783aab0aad62b8edd36791b251aadb.tar.gz
kernel_replicant_linux-c6ac68a612783aab0aad62b8edd36791b251aadb.tar.bz2
kernel_replicant_linux-c6ac68a612783aab0aad62b8edd36791b251aadb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bluetooth/ath3k.c')
-rw-r--r--drivers/bluetooth/ath3k.c3
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,