---

yaml --- r: 314471 b: refs/heads/master c: 489dc48 h: refs/heads/master i: 314469: 7295208 314467: 5953034 314463: ab8be9e v: v3
git-mirror · Jun 5, 2012 · e083b11 · e083b11
1 parent 116a6fb
commit e083b11
Show file tree

Hide file tree

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