aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMax Chou <max.chou@realtek.com>2019-09-05 13:21:57 +0800
committerMarcel Holtmann <marcel@holtmann.org>2019-09-05 17:27:32 +0200
commitcf0d9a705d81a0f581865cefe0880f29589dd06f (patch)
tree91bc5a4887d722f2a846d8b9386ab6e4900ec967 /drivers/bluetooth
parentBluetooth: mgmt: Use struct_size() helper (diff)
downloadlinux-dev-cf0d9a705d81a0f581865cefe0880f29589dd06f.tar.xz
linux-dev-cf0d9a705d81a0f581865cefe0880f29589dd06f.zip
Bluetooth: btrtl: Fix an issue that failing to download the FW which size is over 32K bytes
Fix the issue that when the FW size is 32K+, it will fail for the download process because of the incorrect index. When firmware patch length is over 32K, "dl_cmd->index" may >= 0x80. It will be thought as "data end" that download process will not complete. However, driver should recount the index from 1. Signed-off-by: Max Chou <max.chou@realtek.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btrtl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 0354e93e7a7c..bf3c02be6930 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -401,7 +401,11 @@ static int rtl_download_firmware(struct hci_dev *hdev,
BT_DBG("download fw (%d/%d)", i, frag_num);
- dl_cmd->index = i;
+ if (i > 0x7f)
+ dl_cmd->index = (i & 0x7f) + 1;
+ else
+ dl_cmd->index = i;
+
if (i == (frag_num - 1)) {
dl_cmd->index |= 0x80; /* data end */
frag_len = fw_len % RTL_FRAG_LEN;