diff options
| author | Frédéric Danis <frederic.danis@linux.intel.com> | 2012-10-24 16:34:07 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-10-25 12:34:35 +0300 |
| commit | 5a49021eb173cfcdbb8adbdccdae74c16db09e41 (patch) | |
| tree | ab2a7d565e244aedc78f9122f95363739b183ced | |
| parent | 31c346547ab5be5091e2a2d7e9723acc2e712c77 (diff) | |
adapter: Move pairable read to load_config()
| -rw-r--r-- | src/adapter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/adapter.c b/src/adapter.c index 310d1cfc..d0a8404f 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2499,6 +2499,10 @@ static void load_config(struct btd_adapter *adapter) /* Set class */ 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) @@ -2526,10 +2530,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); |