---
android/bluetooth.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/android/bluetooth.c b/android/bluetooth.c
index add507a..84ab6f9 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -1024,12 +1024,10 @@ static void clear_device_found(gpointer data, gpointer user_data)
static uint8_t get_adapter_discovering_type(void)
{
- uint8_t type;
+ uint8_t type = SCAN_TYPE_NONE;
if (adapter.current_settings & MGMT_SETTING_BREDR)
- type = SCAN_TYPE_BREDR;
- else
- type = 0;
+ type |= SCAN_TYPE_BREDR;
if (adapter.current_settings & MGMT_SETTING_LE)
type |= SCAN_TYPE_LE;
@@ -1045,6 +1043,9 @@ static bool start_discovery(uint8_t type)
DBG("type=0x%x", cp.type);
+ if (cp.type == SCAN_TYPE_NONE)
+ return false;
+
if (mgmt_send(mgmt_if, MGMT_OP_START_DISCOVERY, adapter.index,
sizeof(cp), &cp, NULL, NULL, NULL) > 0)
return true;
@@ -2864,6 +2865,9 @@ static bool stop_discovery(uint8_t type)
DBG("type=0x%x", cp.type);
+ if (cp.type == SCAN_TYPE_NONE)
+ return false;
+
/* Lets drop all confirm name request as we don't need it anymore */
g_slist_foreach(cached_devices, cancel_pending_confirm_name, NULL);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
