summaryrefslogtreecommitdiffstats
path: root/src/adapter.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/adapter.c')
-rw-r--r--src/adapter.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/adapter.c b/src/adapter.c
index 2bc0eb88..9f8f89f7 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -693,12 +693,8 @@ static int set_mode(struct btd_adapter *adapter, uint8_t new_mode)
} else {
/* discoverable or limited */
if ((scan_enable & SCAN_INQUIRY) && (new_mode != adapter->mode)) {
- if (adapter->discov_timeout_id) {
- g_source_remove(adapter->discov_timeout_id);
- adapter->discov_timeout_id = 0;
- }
-
- if (!adapter->mode_sessions && adapter->discov_timeout)
+ adapter_remove_discov_timeout(adapter);
+ if (adapter->discov_timeout)
adapter_set_discov_timeout(adapter,
adapter->discov_timeout);
}