From a32adc61affd315888401e71dd2aa652c63801dc Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 15 Jan 2013 16:19:47 +0200
Subject: [PATCH] core: Move valid discovery type check to mgmt_start_discovery

---
 src/adapter.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 1af3f67dd..40b39ad94 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1299,6 +1299,11 @@ static int mgmt_start_discovery(struct btd_adapter *adapter)
 
 	DBG("%s type 0x%02x", adapter->path, adapter->discov_type);
 
+	if (adapter->discov_type == 0) {
+		error("Invalid discovery type specified");
+		return -EINVAL;
+	}
+
 	cp.type = adapter->discov_type;
 
 	if (mgmt_send(adapter->mgmt, MGMT_OP_START_DISCOVERY,
@@ -1327,11 +1332,6 @@ static gboolean discovery_cb(gpointer user_data)
 				g_slist_length(adapter->discov_sessions) != 1)
 		hci_set_bit(BDADDR_BREDR, &adapter->discov_type);
 
-	if (adapter->discov_type == 0) {
-		warn("Neither LE nor BR/EDR discovery is needed");
-		return FALSE;
-	}
-
 	mgmt_start_discovery(adapter);
 
 	return FALSE;
-- 
2.47.3