summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/ath3k.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-06-05 20:10:07 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-06-05 20:10:07 +0200
commit67be1e4f4b0a512f6af3a7db681ae9b62d31de5e (patch)
tree690ef67ff6b630344e8fd86c7c84b0d31f468f24 /drivers/bluetooth/ath3k.c
parentwil6210: improve debug for WMI receive (diff)
parentBluetooth: Fix L2CAP deadlock (diff)
downloadlinux-67be1e4f4b0a512f6af3a7db681ae9b62d31de5e.tar.xz
linux-67be1e4f4b0a512f6af3a7db681ae9b62d31de5e.zip
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
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,