From 573aa110f3e4e55c9f70e8fe7c3f3f4f07bcbc99 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 22 Feb 2012 15:10:59 +0200
Subject: [PATCH] --- yaml --- r: 291025 b: refs/heads/master c:
 5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5 h: refs/heads/master i:   291023:
 85177c966ed3b296d5eafb9c922eae03c58a6108 v: v3

---
 [refs]                     |  2 +-
 trunk/net/bluetooth/mgmt.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 06eb2f706d4a..157764df97ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bf0e4699d1dd56f7f8c12cf332ebffaf1c5e83e
+refs/heads/master: 5fc6ebb102fdf6f589242ebfe3a07d112d60c7d5
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 9fb44900f7d6..bdaadb278ce7 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/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;
 }