diff options
| author |   Mark Chen <mark-yw.chen@mediatek.com> | 2021-12-07 01:33:42 +0800 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2021-12-07 17:05:52 +0100 |
| commit | 00c0ee9850b7b0cb7c40b8daba806ae2245e59d4 (patch) | |
| tree | 5ca506e0ff6ee4e0f049b29c5d3dd374e753b732 /drivers/bluetooth | |
| parent | Bluetooth: msft: Fix compilation when CONFIG_BT_MSFTEXT is not set (diff) | |
| download | linux-dev-00c0ee9850b7b0cb7c40b8daba806ae2245e59d4.tar.xz linux-dev-00c0ee9850b7b0cb7c40b8daba806ae2245e59d4.zip | |
Bluetooth: btusb: Handle download_firmware failure cases
For Mediatek chipset, it can not enabled if there are something wrong
in btmtk_setup_firmware_79xx(). Thus, the process must be terminated
and returned error code.
Fixes: fc342c4dc4087 ("Bluetooth: btusb: Add protocol support for MediaTek MT7921U USB devices")
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Mark Chen <mark-yw.chen@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index fda5622b1d6e..c9619096d763 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2633,6 +2633,10 @@ static int btusb_mtk_setup(struct hci_dev *hdev) dev_id & 0xffff, (fw_version & 0xff) + 1); err = btmtk_setup_firmware_79xx(hdev, fw_bin_name, btusb_mtk_hci_wmt_sync); + if (err < 0) { + bt_dev_err(hdev, "Failed to set up firmware (%d)", err); + return err; + } /* It's Device EndPoint Reset Option Register */ btusb_mtk_uhw_reg_write(data, MTK_EP_RST_OPT, MTK_EP_RST_IN_OUT_OPT); |