From: "Frédéric Danis" <frederic.danis@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v6 03/16] adaptername: Retrieve config name from adapter
Date: Thu, 18 Oct 2012 15:01:38 +0200 [thread overview]
Message-ID: <1350565311-18330-4-git-send-email-frederic.danis@linux.intel.com> (raw)
In-Reply-To: <1350565311-18330-1-git-send-email-frederic.danis@linux.intel.com>
---
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
next prev parent reply other threads:[~2012-10-18 13:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-18 13:01 [PATCH v6 00/16] Move storage config and names files to ini-file format Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 01/16] doc: Add settings storage documentation Frédéric Danis
2012-10-18 23:13 ` Marcel Holtmann
2012-10-19 0:41 ` Anderson Lizardo
2012-10-19 9:33 ` Frederic Danis
2012-10-19 16:12 ` Marcel Holtmann
2012-10-18 13:01 ` [PATCH v6 02/16] adapter: Read name in storage at init Frédéric Danis
2012-10-18 13:01 ` Frédéric Danis [this message]
2012-10-18 13:01 ` [PATCH v6 04/16] adapter: Read device class " Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 05/16] adapter: Move pairable read to load_config() Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 06/16] adapter: Read pairable timeout in storage at init Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 07/16] adapter: Read discoverable " Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 08/16] adapter: Read mode " Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 09/16] adapter: Move saved config to ini-file format Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 10/16] TODO: Add entry to remove storage convertion function Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 11/16] adapter: Move storage names to cache directory Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 12/16] event: Remove write of LastSeen info Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 13/16] device: Retrieve name from cache directory Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 14/16] dbusoob: Store device name in " Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 15/16] input: Retrieve device name from " Frédéric Danis
2012-10-18 13:01 ` [PATCH v6 16/16] hcitool: Retrieve names " Frédéric Danis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350565311-18330-4-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).