[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20211206173343.31380-1-mark-yw.chen@mediatek.com>
Date: Tue, 7 Dec 2021 01:33:42 +0800
From: <mark-yw.chen@...iatek.com>
To: <marcel@...tmann.org>, <johan.hedberg@...il.com>
CC: <sean.wang@...iatek.com>, <mark-yw.chen@...iatek.com>,
<aaron.hou@...iatek.com>, <kaichuan.hsieh@...onical.com>,
<pmenzel@...gen.mpg.de>, <linux-bluetooth@...r.kernel.org>,
<linux-mediatek@...ts.infradead.org>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH v3 1/2] Bluetooth: btusb: Handle download_firmware failure cases
From: Mark Chen <mark-yw.chen@...iatek.com>
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@...iatek.com>
Signed-off-by: Sean Wang <sean.wang@...iatek.com>
Signed-off-by: Mark Chen <mark-yw.chen@...iatek.com>
---
drivers/bluetooth/btusb.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ab169fc673ea..923cfbe40dae 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2554,6 +2554,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);
--
2.18.0
Powered by blists - more mailing lists