| Message ID | 20190710061222.141247-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5ee6310fb163ba7c66718905d4a19f1e71e641e0 |
| Headers | show |
| Series | [-next] Bluetooth: btusb: Fix error return code in btusb_mtk_setup_firmware() | expand |
Hi Wei, > Fix to return error code -EINVAL from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: a1c49c434e15 ("Bluetooth: btusb: Add protocol support for MediaTek MT7668U USB devices") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/bluetooth/btusb.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) patch has been applied to bluetooth-next tree. Regards Marcel
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 3876fee6ad13..5cf0734eb31b 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2762,8 +2762,10 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname) fw_size = fw->size; /* The size of patch header is 30 bytes, should be skip */ - if (fw_size < 30) + if (fw_size < 30) { + err = -EINVAL; goto err_release_fw; + } fw_size -= 30; fw_ptr += 30;
Fix to return error code -EINVAL from the error handling case instead of 0, as done elsewhere in this function. Fixes: a1c49c434e15 ("Bluetooth: btusb: Add protocol support for MediaTek MT7668U USB devices") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/bluetooth/btusb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)