From e083b1187160625bc53187d7123904200d092270 Mon Sep 17 00:00:00 2001
From: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Date: Wed, 30 May 2012 15:39:22 +0200
Subject: [PATCH] --- yaml --- r: 314471 b: refs/heads/master c:
 489dc48e7583d825304b0aff3fc17e706627b3c8 h: refs/heads/master i:   314469:
 7295208d9d02017fb398ae376c6aa7078b3af161   314467:
 5953034307c10a7941bd1ae202f6ef1bfcb5a35d   314463:
 ab8be9e8c5478f5c9dc7da1bda0437f68deff245 v: v3

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

diff --git a/[refs] b/[refs]
index be24afca8c00..55d4c07e7490 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfc94dbdb999154dc2ff44e6011a4912c0b29e88
+refs/heads/master: 489dc48e7583d825304b0aff3fc17e706627b3c8
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 205574edff20..958f764cc6ab 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -1911,8 +1911,15 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data,
 	rp.addr.type = cp->addr.type;
 
 	if (IS_ERR(conn)) {
+		int status;
+
+		if (PTR_ERR(conn) == -EBUSY)
+			status = MGMT_STATUS_BUSY;
+		else
+			status = MGMT_STATUS_CONNECT_FAILED;
+
 		err = cmd_complete(sk, hdev->id, MGMT_OP_PAIR_DEVICE,
-				   MGMT_STATUS_CONNECT_FAILED, &rp,
+				   status, &rp,
 				   sizeof(rp));
 		goto unlock;
 	}