Bluetooth: Don't clear HCI_DISCOVERABLE when powering off

Once mgmt_set_powered(off) is updated to clear the scan mode we should
not just blindly clear the HCI_DISCOVERABLE flag in mgmt_discoverable()
but first check if there is a pending set_powered operation.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bdc831b3bb9784ea3186c501925d3acf0313c8bd..769b5dc0270d9b393f09a07c60c88c0a2120644d 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -4790,6 +4790,10 @@ void mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
        if (mgmt_pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))
                return;
 
+       /* Powering off may clear the scan mode - don't let that interfere */
+       if (!discoverable && mgmt_pending_find(MGMT_OP_SET_POWERED, hdev))
+               return;
+
        if (discoverable) {
                changed = !test_and_set_bit(HCI_DISCOVERABLE, &hdev->dev_flags);
        } else {