From 1a39736bb121a1aa744ab0e0e1989e1849e8783a Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 20 Mar 2008 22:05:20 +0000 Subject: Fixed wrong report of create device in progress error --- hcid/adapter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hcid/adapter.c b/hcid/adapter.c index fc1608d5..6bfc653a 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -2180,7 +2180,6 @@ static void create_device_req_free(struct create_device_req *create) dbus_message_unref(create->msg); g_free(create->agent_path); g_free(create); - create = NULL; } struct device *adapter_get_device(struct adapter *adapter, const char *dest) @@ -2332,6 +2331,7 @@ cleanup: if (adapter->create) { name_listener_id_remove(adapter->create->id); create_device_req_free(adapter->create); + adapter->create = NULL; } return FALSE; @@ -3552,6 +3552,7 @@ static DBusHandlerResult list_devices(DBusConnection *conn, static void create_device_exit(const char *name, struct adapter *adapter) { create_device_req_free(adapter->create); + adapter->create = NULL; } static void discover_services_cb(gpointer user_data, sdp_list_t *recs, int err) @@ -3643,6 +3644,7 @@ static void discover_services_cb(gpointer user_data, sdp_list_t *recs, int err) failed: name_listener_id_remove(adapter->create->id); create_device_req_free(adapter->create); + adapter->create = NULL; } static DBusHandlerResult discover_services(DBusConnection *conn, -- cgit