diff options
| author | Frédéric Danis <frederic.danis@linux.intel.com> | 2012-10-24 16:34:05 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-10-25 12:33:55 +0300 |
| commit | e01b7cfaf3a80fb17a854b09ea6162cb49e0fea3 (patch) | |
| tree | 84c3ff61ca0a9c684bc60bb7516ca3e026763dd6 | |
| parent | 284af7784999c5ffad91d04f48e4c99bffee86de (diff) | |
adaptername: Retrieve config name from adapter
| -rw-r--r-- | plugins/adaptername.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/adaptername.c b/plugins/adaptername.c index f58fb0f8..353f11c2 100644 --- a/plugins/adaptername.c +++ b/plugins/adaptername.c @@ -211,8 +211,10 @@ static int adaptername_probe(struct btd_adapter *adapter) adapter_set_allow_name_changes(adapter, TRUE); current_id = adapter_get_dev_id(adapter); - if (read_local_name(adapter_get_address(adapter), name) < 0) - expand_name(name, MAX_NAME_LENGTH, main_opts.name, current_id); + if (btd_adapter_get_name(adapter) != NULL) + return 0; + + expand_name(name, MAX_NAME_LENGTH, main_opts.name, current_id); DBG("Setting name '%s' for device 'hci%d'", name, current_id); adapter_set_name(adapter, name); |