---

yaml --- r: 291025 b: refs/heads/master c: 5fc6ebb h: refs/heads/master i: 291023: 85177c9 v: v3
git-mirror · Feb 23, 2012 · 573aa11 · 573aa11
1 parent 102730c
commit 573aa11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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;
 }