diff options
| author | Abhishek Pandit-Subedi <abhishekpandit@chromium.org> | 2021-01-06 05:58:58 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2021-01-06 08:40:37 +0100 |
| commit | b649813eadbc062d8682f7a20aa025275707dd1f (patch) | |
| tree | 9fe4b9c2410a6bad5acd596f9288b1bed652192b /drivers | |
| parent | Bluetooth: Fix initializing response id after clearing struct (diff) | |
| download | linux-b649813eadbc062d8682f7a20aa025275707dd1f.tar.xz linux-b649813eadbc062d8682f7a20aa025275707dd1f.zip | |
Bluetooth: btrtl: Add null check in setup
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>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bluetooth/btrtl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c index 1abf6a4d6727..24f03a1f8d57 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c @@ -719,6 +719,9 @@ int btrtl_setup_realtek(struct hci_dev *hdev) */ set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks); + if (!btrtl_dev->ic_info) + goto done; + /* Enable central-peripheral role (able to create new connections with * an existing connection in slave role). */ @@ -731,6 +734,7 @@ int btrtl_setup_realtek(struct hci_dev *hdev) break; } +done: btrtl_free(btrtl_dev); return ret; } |