Diff between a8e2a118db9a50f8d91376c70a05e4b0b2edfbe5 and b42d23e56061cf657e9c6aad98d6afd183ecc4bf

Changed Files

File Additions Deletions Status
src/adapter.c +2 -6 modified
src/agent.c +0 -1 modified
src/device.c +0 -1 modified

Full Patch

diff --git a/src/adapter.c b/src/adapter.c
index 060d895..cf063ba 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1063,10 +1063,8 @@ static void service_auth_cancel(struct service_auth *auth)
 
 	dbus_error_free(&derr);
 
-	if (auth->agent != NULL) {
-		agent_cancel(auth->agent);
+	if (auth->agent != NULL)
 		agent_unref(auth->agent);
-	}
 
 	g_free(auth);
 }
@@ -4742,10 +4740,8 @@ int btd_cancel_authorization(guint id)
 
 	g_queue_remove(auth->adapter->auths, auth);
 
-	if (auth->agent) {
-		agent_cancel(auth->agent);
+	if (auth->agent)
 		agent_unref(auth->agent);
-	}
 
 	g_free(auth);
 
diff --git a/src/agent.c b/src/agent.c
index 6887bc1..4a2f606 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -329,7 +329,6 @@ static void simple_agent_reply(DBusPendingCall *call, void *user_data)
 
 		if (dbus_error_has_name(&err, DBUS_ERROR_NO_REPLY)) {
 			error("Timed out waiting for reply from agent");
-			agent_cancel(agent);
 			dbus_message_unref(message);
 			dbus_error_free(&err);
 			agent_unref(agent);
diff --git a/src/device.c b/src/device.c
index 2e25fe6..a4ea140 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1812,7 +1812,6 @@ static void bonding_request_free(struct bonding_req *bonding)
 		g_free(bonding->cb_iter);
 
 	if (bonding->agent) {
-		agent_cancel(bonding->agent);
 		agent_unref(bonding->agent);
 		bonding->agent = NULL;
 	}