From b10c612615dfd3329be404092121b146232a87bb Mon Sep 17 00:00:00 2001
From: Andre Guedes <andre.guedes@openbossa.org>
Date: Mon, 13 Feb 2012 15:41:01 -0300
Subject: [PATCH] --- yaml --- r: 290954 b: refs/heads/master c:
 203159d486006a18fa1ccf787a10d15d3128cdac h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1969f3fcc6ab..fe10260145ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e70bb2e89959983aebcfce28f645a1104ffa9ab2
+refs/heads/master: 203159d486006a18fa1ccf787a10d15d3128cdac
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 8efbd8eaa1b3..066d338be1ce 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -3096,6 +3096,8 @@ int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status)
 	struct pending_cmd *cmd;
 	int err;
 
+	hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
+
 	cmd = mgmt_pending_find(MGMT_OP_START_DISCOVERY, hdev);
 	if (!cmd)
 		return -ENOENT;