From: <mark-yw.chen@mediatek.com>
To: <marcel@holtmann.org>, <johan.hedberg@gmail.com>
Cc: <mark-yw.chen@mediatek.com>, <aaron.hou@mediatek.com>,
<kaichuan.hsieh@canonical.com>, <linux-bluetooth@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH] Bluetooth: btusb: Handle download_firmware failure cases.
Date: Mon, 6 Dec 2021 17:25:46 +0800 [thread overview]
Message-ID: <20211206092546.27216-1-mark-yw.chen@mediatek.com> (raw)
From: mark-yw.chen <mark-yw.chen@mediatek.com>
For Mediatek chipset, if there are no firmware bin or command_timeout,
the process should be terminated in btusb_mtk_setup().
Signed-off-by: mark-yw.chen <mark-yw.chen@mediatek.com>
Change-Id: I99f1d7b72fa70643d9123e7e6cdc8d0b4369ce52
---
drivers/bluetooth/btmtk.c | 1 +
drivers/bluetooth/btusb.c | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index c2ee5c4b975a..526dfdf1fe01 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -121,6 +121,7 @@ int btmtk_setup_firmware_79xx(struct hci_dev *hdev, const char *fwname,
} else {
bt_dev_err(hdev, "Failed wmt patch dwnld status (%d)",
status);
+ err = -EIO;
goto err_release_fw;
}
}
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ab169fc673ea..3ea04b1d0750 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 setup 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
next reply other threads:[~2021-12-06 9:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 9:25 mark-yw.chen [this message]
2021-12-06 9:50 ` [PATCH] Bluetooth: btusb: Handle download_firmware failure cases Paul Menzel
2021-12-06 14:47 ` Mark-YW Chen (陳揚文)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211206092546.27216-1-mark-yw.chen@mediatek.com \
--to=mark-yw.chen@mediatek.com \
--cc=aaron.hou@mediatek.com \
--cc=johan.hedberg@gmail.com \
--cc=kaichuan.hsieh@canonical.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).