---

yaml --- r: 278559 b: refs/heads/master c: c3f0675 h: refs/heads/master i: 278557: e538553 278555: 2c9159f 278551: 3f7aaa5 278543: 8c3f7ad 278527: 60182f3 v: v3
git-mirror · Nov 10, 2011 · c448a65 · c448a65
1 parent 6673b8c
commit c448a65
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48264f06943e2db2c971b752949606f070d9d292
+refs/heads/master: c3f06755ca4279597cd58befd6c076ae2e3db480
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
@@ -1331,19 +1331,14 @@ static void pairing_complete(struct pending_cmd *cmd, u8 status)
 static void pairing_complete_cb(struct hci_conn *conn, u8 status)
 {
 	struct pending_cmd *cmd;
-	struct hci_dev *hdev = conn->hdev;
 
 	BT_DBG("status %u", status);
 
-	hci_dev_lock_bh(hdev);
-
 	cmd = find_pairing(conn);
 	if (!cmd)
 		BT_DBG("Unable to find a pending command");
 	else
 		pairing_complete(cmd, status);
-
-	hci_dev_unlock_bh(hdev);
 }
 
 static int pair_device(struct sock *sk, u16 index, unsigned char *data, u16 len)