Merge branch 'lkmm.2021.05.10c' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / bluetooth / hci_h5.c

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 27e96681d5838decfd16ce0cd24679f144ac7cb0..e0520639f4ba01c9f4cf9c36a48dec22c28f4296 100644 (file)
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -906,10 +906,7 @@ static int h5_btrtl_setup(struct h5 *h5)
        /* Give the device some time before the hci-core sends it a reset */
        usleep_range(10000, 20000);
 
-       /* Enable controller to do both LE scan and BR/EDR inquiry
-        * simultaneously.
-        */
-       set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &h5->hu->hdev->quirks);
+       btrtl_set_quirks(h5->hu->hdev, btrtl_dev);
 
 out_free:
        btrtl_free(btrtl_dev);