From: Marcel Holtmann Date: Sun, 1 Nov 2015 08:45:22 +0000 (+0100) Subject: Bluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask X-Git-Tag: v4.5-rc1~128^2~250^2~47 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9fe759ceedcdc0c43234382425a158c3f31e6909;p=karo-tx-linux.git Bluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask When setting the event mask, the HCI_QUIRK_FIXUP_INQUIRY_MODE quirk is required to be checked so that the Inquiry Result with RSSI event gets actually enabled. Signed-off-by: Marcel Holtmann Signed-off-by: Johan Hedberg --- diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index ea95075f1826..556c173ccbc6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -548,7 +548,8 @@ static void hci_setup_event_mask(struct hci_request *req) } } - if (lmp_inq_rssi_capable(hdev)) + if (lmp_inq_rssi_capable(hdev) || + test_bit(HCI_QUIRK_FIXUP_INQUIRY_MODE, &hdev->quirks)) events[4] |= 0x02; /* Inquiry Result with RSSI */ if (lmp_ext_feat_capable(hdev))