iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: btrtl: Add null check in setup

Browse Source 
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: 05672a2c14 (Bluetooth: btrtl: Enable central-peripheral role)
Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Abhishek Pandit-Subedi 2021-01-05 20:58:58 -08:00 committed by Marcel Holtmann
parent a5687c6440
commit b649813ead
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bluetooth/btrtl.c
View File

@ -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;
}