diff options
| author | Johan Hedberg | 2012-02-22 14:10:59 +0100 |
|---|---|---|
| committer | Johan Hedberg | 2012-02-23 12:06:59 +0100 |
| commit | 5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5 (patch) | |
| tree | f8c4854cf6af25501e6aa70cea1a662ad88af6f8 /net/bluetooth/mgmt.c | |
| parent | Bluetooth: Fix coding style issues in mgmt code (diff) | |
| download | kernel-qcow2-linux-5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5.tar.gz kernel-qcow2-linux-5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5.tar.xz kernel-qcow2-linux-5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5.zip | |
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/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 11 |
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; } |