From c448a658ed5e0b8c29492f189a8dd86d5deb984a Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Thu, 10 Nov 2011 15:54:37 +0200
Subject: [PATCH] --- yaml --- r: 278559 b: refs/heads/master c:
 c3f06755ca4279597cd58befd6c076ae2e3db480 h: refs/heads/master i:   278557:
 e538553f23a70124a9df293b3d50abafcf821e2d   278555:
 2c9159ff019abbfaaab15ee19469bbf054c0319f   278551:
 3f7aaa552842c3f39035be95caf1edf3c5c745eb   278543:
 8c3f7ad38f78e4bd72d3005eb95ac125a7248423   278527:
 60182f3596b168f0a8302e7ae396a910783dc901 v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5f2e8438b8df..9a20e5765d4b 100644
--- 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
index d23a803d69df..c3d7852baa1f 100644
--- 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)