Fix Adapter Name property setting when the adapter is DOWN

It should be possible to set the name even when the adapter is down. The
recent hciops patches broke this behavior and this patch fixes it again.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/adapter.c b/src/adapter.c
index 15fc61304..bf69fcc68 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -903,7 +903,6 @@ static DBusMessage *set_name(DBusConnection *conn, DBusMessage *msg,
 {
 	struct btd_adapter *adapter = data;
 	struct hci_dev *dev = &adapter->dev;
-	int err;
 
 	if (!g_utf8_validate(name, -1, NULL)) {
 		error("Name change failed: supplied name isn't valid UTF-8");
@@ -913,12 +912,14 @@ static DBusMessage *set_name(DBusConnection *conn, DBusMessage *msg,
 	if (strncmp(name, (char *) dev->name, MAX_NAME_LENGTH) == 0)
 		goto done;
 
-	if (!adapter->up)
-		return failed_strerror(msg, -EHOSTDOWN);
-
-	err = adapter_ops->set_name(adapter->dev_id, name);
-	if (err < 0)
-		return failed_strerror(msg, err);
+	if (!adapter->up) {
+		strncpy((char *) adapter->dev.name, name, MAX_NAME_LENGTH);
+		write_local_name(&adapter->bdaddr, name);
+	} else {
+		int err = adapter_ops->set_name(adapter->dev_id, name);
+		if (err < 0)
+			return failed_strerror(msg, err);
+	}
 
 done:
 	return dbus_message_new_method_return(msg);