summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-adapter.c
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2006-09-19 19:46:09 +0000
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2006-09-19 19:46:09 +0000
commit4b0b4c6b25a119e7011d2da9827481a6c1690dc0 (patch)
treefea7e1c272e88b2b52f7b208bea7e478fa90743c /hcid/dbus-adapter.c
parent4c172501d839e5d7c3f46510432b731ea2768dbf (diff)
GetName: Check if the adapter is ready before send the read local name cmd
Diffstat (limited to 'hcid/dbus-adapter.c')
-rw-r--r--hcid/dbus-adapter.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 97330dc5..3fbd0c36 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -995,11 +995,14 @@ static DBusHandlerResult handle_dev_get_name_req(DBusConnection *conn, DBusMessa
str2ba(dbus_data->address, &ba);
err = read_local_name(&ba, str);
- if (err < 0)
- err = get_device_name(dbus_data->dev_id, str, sizeof(str));
+ if (err < 0) {
+ if (!dbus_data->up)
+ return error_not_ready(conn, msg);
- if (err < 0)
- return error_failed(conn, msg, -err);
+ err = get_device_name(dbus_data->dev_id, str, sizeof(str));
+ if (err < 0)
+ return error_failed(conn, msg, -err);
+ }
reply = dbus_message_new_method_return(msg);
if (!reply)