[PATCH v7 03/16] adaptername: Retrieve config name from adapter
From: Frédéric Danis <hidden>
Date: 2012-10-24 14:34:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- plugins/adaptername.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/plugins/adaptername.c b/plugins/adaptername.c
index f58fb0f..353f11c 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);
--
1.7.9.5