From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
To: marcel@holtmann.org
Cc: chromeos-bluetooth-upstreaming@chromium.org,
linux-bluetooth@vger.kernel.org,
Abhishek Pandit-Subedi <abhishekpandit@chromium.org>,
Johan Hedberg <johan.hedberg@gmail.com>,
Daniel Winkler <danielwinkler@google.com>,
linux-kernel@vger.kernel.org,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Subject: [PATCH] Bluetooth: btrtl: Add null check in setup
Date: Tue, 22 Dec 2020 18:48:24 -0800 [thread overview]
Message-ID: <20201222184753.1.I9438ef1f79fa1132e74c67b489123291080b9a8c@changeid> (raw)
btrtl_dev->ic_info is only available from the controller on cold boot
(the lmp subversion matches the device model and this is used to look up
the ic_info). On warm boots (firmware already loaded),
btrtl_dev->ic_info is null.
Fixes: 05672a2c14a4 (Bluetooth: btrtl: Enable central-peripheral role)
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
---
drivers/bluetooth/btrtl.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 1abf6a4d672734f..978f3c773856b05 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -719,16 +719,19 @@ int btrtl_setup_realtek(struct hci_dev *hdev)
*/
set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
- /* Enable central-peripheral role (able to create new connections with
- * an existing connection in slave role).
- */
- switch (btrtl_dev->ic_info->lmp_subver) {
- case RTL_ROM_LMP_8822B:
- set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
- break;
- default:
- rtl_dev_dbg(hdev, "Central-peripheral role not enabled.");
- break;
+ if (btrtl_dev->ic_info) {
+ /* Enable central-peripheral role (able to create new
+ * connections with an existing connection in slave role).
+ */
+ switch (btrtl_dev->ic_info->lmp_subver) {
+ case RTL_ROM_LMP_8822B:
+ set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);
+ break;
+ default:
+ rtl_dev_dbg(hdev,
+ "Central-peripheral role not enabled.");
+ break;
+ }
}
btrtl_free(btrtl_dev);
--
2.29.2.729.g45daf8777d-goog
next reply other threads:[~2020-12-23 2:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-23 2:48 Abhishek Pandit-Subedi [this message]
2020-12-23 6:22 ` [PATCH] Bluetooth: btrtl: Add null check in setup Marcel Holtmann
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=20201222184753.1.I9438ef1f79fa1132e74c67b489123291080b9a8c@changeid \
--to=abhishekpandit@chromium.org \
--cc=chromeos-bluetooth-upstreaming@chromium.org \
--cc=danielwinkler@google.com \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
--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).