[PATCH v5 05/15] adapter: Move pairable read to load_config()
STALE5099d
From: Frédéric Danis <hidden>
Date: 2012-10-18 09:00:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- src/adapter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index dd06d46..74c36ec 100644
--- a/src/adapter.c
+++ b/src/adapter.c@@ -2515,6 +2515,10 @@ static void load_config(struct btd_adapter *adapter) (class[2] << 16); else adapter->dev_class = main_opts.class; + + /* Get pairable mode */ + if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0) + adapter->pairable = TRUE; } gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
@@ -2542,10 +2546,6 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up) clear_blocked(adapter); load_devices(adapter); - /* Set pairable mode */ - if (read_device_pairable(&adapter->bdaddr, &adapter->pairable) < 0) - adapter->pairable = TRUE; - /* retrieve the active connections: address the scenario where * the are active connections before the daemon've started */ load_connections(adapter);
--
1.7.9.5