summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-22 15:10:59 +0200
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-23 13:06:59 +0200
commit5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5 (patch)
treef8c4854cf6af25501e6aa70cea1a662ad88af6f8 /net/bluetooth
parent6bf0e4699d1dd56f7f8c12cf332ebffaf1c5e83e (diff)
downloadlinux-5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5.tar.bz2
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/mgmt.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 9fb44900f7d6..bdaadb278ce7 100644
--- 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;
}