Commit b649813e authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Marcel Holtmann
Browse files

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: 05672a2c (Bluetooth: btrtl: Enable central-peripheral role)
Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a5687c64

drivers/bluetooth/btrtl.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

}