Bluetooth: mgmt: Fix EIR toggling with SSP

This patch fixes setting the EIR properly when the SSP flag has been set
when powered off (in such a case there is no pending Set_SSP command).

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

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 9fb44900f7d60afcd9dcfb81e50f77bb60112439..bdaadb278ce7d922b32ea474eeb057dcfb50dde9 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3437,14 +3437,13 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status)
        if (changed)
                err = new_settings(hdev, match.sk);
 
-       if (match.sk) {
+       if (match.sk)
                sock_put(match.sk);
 
-               if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags))
-                       update_eir(hdev);
-               else
-                       clear_eir(hdev);
-       }
+       if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags))
+               update_eir(hdev);
+       else
+               clear_eir(hdev);
 
        return err;
 }